ai-agent-test 0.9.4 → 0.9.6

package/README.md

@@ -76,7 +76,8 @@ Start CLI with selected model (default is the first model in the array):
 
 ```bash
 # option 1
-ai models 1 # to select the second model (Google Gemini)
+ai models          # List all available models
+ai --model 1       # Select the second model (Google Gemini)
 
 # option 2
 export AI_MODEL_INDEX=1
@@ -116,8 +117,15 @@ When installed globally, run `ai` to start the interactive CLI:
 View and restore previous sessions:
 
 ```bash
-ai sessions ls          # List last 20 sessions with 0-based indexing
-ai sessions 2           # Load and restart from session 2
+ai sessions            # List last 20 sessions with 0-based indexing
+ai --session 2         # Load and restart from session 2
+```
+
+You can also combine model and session options:
+
+```bash
+ai --model 1 --session 2    # Use model 1 and load session 2
+ai -m 1 -s 2                # Short form of the above command
 ```
 
 When loading a session, the conversation history is restored and logged to the current session file.

package/SYSTEM.md

@@ -12,9 +12,9 @@ Critical workflow rules:
 
 Git best practices:
 
-- When user says "commit" - Perform both git add, git commit, and git push (no confirmation needed). Important note! If you made new changes, ask user's permission again even though user already said "commit".
-- Run git status before staging to verify what changes will be committed
-- When staging changes (with approval), always check that only intended files are staged
+- When user says "commit" - Perform both git add, git commit, and git push (no confirmation needed).
+- Important note! If you've just done new changes upon user request, ask user if they want you to commit/push even though user said "commit" before, not just commit yourself.
+- Run git status before staging to verify what changes will be committed. Always check that only intended files are staged.
 - Avoid staging large batches (>10 files) or common problematic folders like /dist, /node_modules, \*.log, .DS_Store. Ask to user.
 
 Tools and skills:

package/bin/ai

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
-import { argv } from "process"
 import { execSync } from "child_process"
 import { readFileSync } from "fs"
 import { homedir } from "os"
 import { join } from "path"
+import { argv } from "process"
 
 import { loadConfig } from "../dist/config.js"
 import {
@@ -12,38 +12,112 @@ import {
   loadSession,
   getSessionFileByIndex,
 } from "../dist/utils/system.js"
+import yargs from "yargs"
+import { hideBin } from "yargs/helpers"
+
+const packageJson = JSON.parse(
+  readFileSync(new URL("../package.json", import.meta.url), "utf-8"),
+)
+
+// Parse arguments using yargs
+const args = yargs(hideBin(argv))
+  .option("model", {
+    alias: "m",
+    type: "number",
+    describe: "Start with model index from `ai models`",
+  })
+  .option("session", {
+    alias: "s",
+    type: "number",
+    describe: "Resume with session index from `ai sessions`",
+  })
+  .command(
+    "models",
+    "List all available models",
+    () => {},
+    () => {
+      try {
+        const modelsFile = join(homedir(), ".ai", "models.json")
+        const fileContent = readFileSync(modelsFile, "utf-8")
+        const models = JSON.parse(fileContent)
+
+        if (!Array.isArray(models) || models.length === 0) {
+          console.log("No models found in ~/.ai/models.json")
+          process.exit(1)
+        }
 
-// Handle models command
-if (argv[2] === "models") {
-  const subCommand = argv[3]
-
-  if (subCommand === "ls") {
-    try {
-      const modelsFile = join(homedir(), ".ai", "models.json")
-      const fileContent = readFileSync(modelsFile, "utf-8")
-      const models = JSON.parse(fileContent)
-
-      if (!Array.isArray(models) || models.length === 0) {
-        console.log("No models found in ~/.ai/models.json")
+        const displayPath = modelsFile.replace(homedir(), "~")
+        console.log(`Available models (${displayPath}):`)
+        models.forEach((model, index) => {
+          console.log(`${index}. ${model.modelName} (${model.modelApiType})`)
+        })
+        process.exit(0)
+      } catch (error) {
+        console.error(`Failed to load models: ${error.message}`)
         process.exit(1)
       }
-
-      const displayPath = modelsFile.replace(homedir(), "~")
-      console.log(`Available models (${displayPath}):`)
-      models.forEach((model, index) => {
-        console.log(`${index}. ${model.modelName} (${model.modelApiType})`)
-      })
+    },
+  )
+  .command(
+    "sessions",
+    "List last 20 sessions",
+    () => {},
+    () => {
+      const sessions = listSessions(20)
+      if (sessions.length === 0) {
+        console.log("No sessions found.")
+      } else {
+        console.log(`Last ${sessions.length} sessions:`)
+        sessions.forEach((session, index) => {
+          let line = `${index}. ${session.timestamp}`
+          if (session.summary) {
+            line += ` - ${session.summary}`
+          }
+          console.log(line)
+        })
+      }
       process.exit(0)
-    } catch (error) {
-      console.error(`Failed to load models: ${error.message}`)
-      process.exit(1)
-    }
-  } else if (subCommand) {
-    process.env.AI_MODEL_INDEX = subCommand
-  } else {
-    console.log("Usage: ai models <index> or ai models ls")
+    },
+  )
+  .command(
+    "update",
+    "Update the ai-agent-test package to the latest version",
+    () => {},
+    () => {
+      execSync("npm install -g ai-agent-test", { stdio: "inherit" })
+      process.exit(0)
+    },
+  )
+  .help()
+  .version(packageJson.version)
+  .alias("version", "v")
+  .alias("help", "h")
+  .parse()
+
+// Handle model index from --model option
+if (args.model !== undefined) {
+  process.env.AI_MODEL_INDEX = args.model.toString()
+}
+
+// Handle session index from --session option
+if (args.session !== undefined) {
+  const sessionIndex = args.session
+  const sessionFile = getSessionFileByIndex(sessionIndex)
+  if (!sessionFile) {
+    console.log(`Session ${sessionIndex} not found.`)
+    process.exit(1)
+  }
+
+  const messages = loadSession(sessionFile)
+  if (!messages) {
+    console.log(`Could not load session ${sessionIndex}.`)
     process.exit(1)
   }
+
+  process.env.AI_SESSION_INDEX = sessionIndex.toString()
+  process.env.AI_SESSION_FILE = sessionFile
+
+  console.log(`Loaded session ${sessionIndex} from ${sessionFile}`)
 }
 
 // Load config after setting model index
@@ -53,98 +127,4 @@ process.env.AI_MODEL_NAME = config.modelName
 process.env.AI_API_BASE_URL = config.apiBaseUrl
 process.env.AI_API_KEY = config.apiKey
 
-// Handle --version command
-if (argv[2] === "--version") {
-  const packageJson = JSON.parse(
-    readFileSync(new URL("../package.json", import.meta.url), "utf-8"),
-  )
-  console.log(packageJson.version)
-  process.exit(0)
-}
-
-// Handle --help command
-if (argv[2] === "--help") {
-  const packageJson = JSON.parse(
-    readFileSync(new URL("../package.json", import.meta.url), "utf-8"),
-  )
-  console.log(`ai-agent-test v${packageJson.version}
-
-Usage: ai [options] [model-index]
-
-Commands:
-  models ls        List all available models
-  models <idx>     Run with model at index <idx> from config
-  sessions ls      List last 20 sessions
-  sessions <idx>   Load and restart from session <idx>
-  update           Update the ai-agent-test package to the latest version
-  --version      Show version number
-  --help         Show help message
-
-Arguments:
-  model-index    Index of the model to use (from ~/.ai/models.json)
-
-Examples:
-  ai                    # Run with default model
-  ai models ls          # List all available models
-  ai models 1           # Run with second model in config
-  ai sessions ls        # List last 20 sessions
-  ai sessions 2         # Load and restart from session 2
-  ai update             # Update to latest version
-  ai --version          # Show version
-  ai --help             # Show help
-`)
-  process.exit(0)
-}
-
-// Handle update command
-if (argv[2] === "update") {
-  execSync("npm install -g ai-agent-test", { stdio: "inherit" })
-  process.exit(0)
-}
-
-// Handle sessions command
-if (argv[2] === "sessions") {
-  const subCommand = argv[3]
-
-  if (subCommand === "ls") {
-    const sessions = listSessions(20)
-    if (sessions.length === 0) {
-      console.log("No sessions found.")
-    } else {
-      console.log(`Last ${sessions.length} sessions:`)
-      sessions.forEach((session, index) => {
-        let line = `${index}. ${session.timestamp}`
-        if (session.summary) {
-          line += ` - ${session.summary}`
-        }
-        console.log(line)
-      })
-    }
-    process.exit(0)
-  } else {
-    const sessionIndex = subCommand ? parseInt(subCommand, 10) : undefined
-    if (sessionIndex !== undefined && !isNaN(sessionIndex)) {
-      const sessionFile = getSessionFileByIndex(sessionIndex)
-      if (!sessionFile) {
-        console.log(`Session ${sessionIndex} not found.`)
-        process.exit(1)
-      }
-
-      const messages = loadSession(sessionFile)
-      if (!messages) {
-        console.log(`Could not load session ${sessionIndex}.`)
-        process.exit(1)
-      }
-
-      process.env.AI_SESSION_INDEX = sessionIndex.toString()
-      process.env.AI_SESSION_FILE = sessionFile
-
-      console.log(`Loaded session ${sessionIndex} from ${sessionFile}`)
-    } else {
-      console.log("Usage: ai sessions <index> or ai sessions ls")
-      process.exit(1)
-    }
-  }
-}
-
 import("../dist/index.js")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-agent-test",
-  "version": "0.9.4",
+  "version": "0.9.6",
   "main": "dist/index.js",
   "bin": {
     "ai": "./bin/ai"
@@ -55,6 +55,7 @@
     "chalk": "^5.6.2",
     "dotenv": "^17.4.1",
     "jsdom": "^29.0.1",
+    "yargs": "^18.0.0",
     "zod": "^4.3.6"
   }
 }