Merge pull request #15 from osodevops/codex/skill-cli-onboarding

Add Keito skill onboarding commands

Author: sionsmith

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/),
 and this project adheres to [Semantic Versioning](https://semver.org/).
 
+## [0.1.5] - 2026-05-12
+
+### Added
+
+- `keito skill install`, `keito skill status`, and `keito skill doctor` commands for installing and verifying the Keito Agent Skill.
+- Optional interactive Agent Skill install prompt after `keito auth login`.
+- JSON-safe skill installer execution so child installer output does not contaminate `--json` responses.
+
 ## [0.1.4] - 2026-05-12
 
 ### Added

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "keito-cli"
-version = "0.1.4"
+version = "0.1.5"
 edition = "2021"
 description = "CLI for AI agents and humans to track billable time against the Keito platform"
 license = "MIT"

Cargo.toml

@@ -1,6 +1,7 @@
 pub mod auth;
 pub mod clients;
 pub mod projects;
+pub mod skill;
 pub mod time;
 
 use clap::{Parser, Subcommand};
@@ -104,4 +105,6 @@ pub enum Command {
     Time(time::TimeCommand),
     /// Browse projects and tasks
     Projects(projects::ProjectsCommand),
+    /// Install and verify the Keito agent skill
+    Skill(skill::SkillCommand),
 }

src/cli/mod.rs

@@ -0,0 +1,74 @@
+use clap::{Args, Subcommand, ValueEnum};
+
+#[derive(Args)]
+#[command(after_long_help = "\
+The Keito Skill is the agent UX layer on top of the Keito CLI. The skill
+uses the CLI for authentication and API writes, then installs Claude Code /
+Codex lifecycle hooks so local coding sessions can be logged automatically.
+
+EXAMPLES:
+  keito skill install
+  keito skill install --agent codex
+  keito skill status --json
+  keito skill doctor")]
+pub struct SkillCommand {
+    #[command(subcommand)]
+    pub command: SkillSubcommand,
+}
+
+#[derive(Subcommand)]
+pub enum SkillSubcommand {
+    /// Install the Keito Skill and configure supported agent hooks
+    #[command(long_about = "\
+Install the Keito Skill via the open skills CLI, then run the installed hook
+installer for each selected agent.
+
+By default this configures both Codex and Claude Code. The skill still needs
+per-repository setup after installation: cd into a client repo and run
+/track-time-keito to select its Keito client, project, and task.")]
+    Install {
+        /// Skill source for npx skills add
+        #[arg(
+            long,
+            default_value = "keito-ai/keito-skill",
+            env = "KEITO_SKILL_SOURCE"
+        )]
+        source: String,
+
+        /// Agent hook target to configure
+        #[arg(long, value_enum)]
+        agent: Vec<SkillAgent>,
+
+        /// Skip running npx skills add and only run hook installers if present
+        #[arg(long)]
+        skip_skills_add: bool,
+    },
+
+    /// Show install/auth/hook status for the Keito Skill
+    Status,
+
+    /// Run readiness checks and print next actions
+    Doctor,
+}
+
+#[derive(Debug, Clone, Copy, ValueEnum, PartialEq, Eq)]
+pub enum SkillAgent {
+    Codex,
+    ClaudeCode,
+}
+
+impl SkillAgent {
+    pub fn skills_cli_name(self) -> &'static str {
+        match self {
+            SkillAgent::Codex => "codex",
+            SkillAgent::ClaudeCode => "claude-code",
+        }
+    }
+
+    pub fn display_name(self) -> &'static str {
+        match self {
+            SkillAgent::Codex => "Codex",
+            SkillAgent::ClaudeCode => "Claude Code",
+        }
+    }
+}

src/cli/skill.rs

@@ -1,9 +1,11 @@
 use colored::Colorize;
-use dialoguer::{Input, Password};
+use dialoguer::{Confirm, Input, Password};
+use std::io::IsTerminal;
 
 use crate::api::KeitorClient;
 use crate::cli::auth::{AuthCommand, AuthSubcommand};
 use crate::cli::GlobalFlags;
+use crate::commands::skill;
 use crate::config::{AppConfig, ResolvedAuth};
 use crate::error::AppError;
 use crate::output::{self, OutputMode};
@@ -71,6 +73,27 @@ async fn login(global: &GlobalFlags, mode: OutputMode) -> Result<(), AppError> {
             "Credentials saved to {}.",
             AppConfig::config_path()?.display()
         );
+        maybe_offer_skill_install(global, mode).await?;
+    }
+
+    Ok(())
+}
+
+async fn maybe_offer_skill_install(global: &GlobalFlags, mode: OutputMode) -> Result<(), AppError> {
+    if mode != OutputMode::Table || global.quiet || !std::io::stdin().is_terminal() {
+        return Ok(());
+    }
+
+    let install = Confirm::new()
+        .with_prompt("Install the Keito agent skill for Claude Code / Codex?")
+        .default(true)
+        .interact()
+        .map_err(|e| AppError::Config(format!("Input error: {e}")))?;
+
+    if install {
+        skill::install_defaults(global, mode).await?;
+    } else {
+        println!("You can install it later with: keito skill install");
     }
 
     Ok(())

src/commands/auth.rs

@@ -1,4 +1,5 @@
 pub mod auth;
 pub mod clients;
 pub mod projects;
+pub mod skill;
 pub mod time;