@sandagent/runner-cli 0.2.9 → 0.2.11

package/dist/bundle.mjs

@@ -3,9 +3,136 @@
 // src/cli.ts
 import { parseArgs } from "node:util";
 
+// src/build-image.ts
+import { execSync } from "node:child_process";
+import {
+  copyFileSync,
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  readdirSync,
+  statSync,
+  writeFileSync
+} from "node:fs";
+import { basename, dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+function getPackageRoot() {
+  const thisDir = dirname(fileURLToPath(import.meta.url));
+  return resolve(thisDir, "..");
+}
+function getShippedDockerfile() {
+  const packageRoot = getPackageRoot();
+  const candidates = [
+    join(packageRoot, "Dockerfile"),
+    resolve(
+      packageRoot,
+      "..",
+      "..",
+      "docker",
+      "sandagent-claude",
+      "Dockerfile"
+    )
+  ];
+  for (const p of candidates) {
+    if (existsSync(p)) return p;
+  }
+  console.error(
+    `\u274C Dockerfile not found. Searched:
+${candidates.map((c) => `   ${c}`).join("\n")}`
+  );
+  process.exit(1);
+}
+function run(cmd, cwd) {
+  execSync(cmd, { stdio: "inherit", cwd });
+}
+function ensureDocker() {
+  try {
+    execSync("docker info", { stdio: "ignore" });
+  } catch {
+    console.error("\u274C Docker is not running. Please start Docker first.");
+    process.exit(1);
+  }
+}
+function resolveTemplatePath(template) {
+  const abs = resolve(process.cwd(), template);
+  if (!existsSync(abs)) {
+    console.error(`\u274C Template directory not found: ${abs}`);
+    process.exit(1);
+  }
+  return abs;
+}
+function copyDirSync(src, dest) {
+  mkdirSync(dest, { recursive: true });
+  for (const entry of readdirSync(src)) {
+    const srcPath = join(src, entry);
+    const destPath = join(dest, entry);
+    if (statSync(srcPath).isDirectory()) {
+      copyDirSync(srcPath, destPath);
+    } else {
+      copyFileSync(srcPath, destPath);
+    }
+  }
+}
+async function buildImage(opts) {
+  const templatePath = opts.template ? resolveTemplatePath(opts.template) : null;
+  const templateName = templatePath ? basename(templatePath) : null;
+  const localImage = opts.image ?? `${opts.name}:${opts.tag}`;
+  console.log("\u{1F4E6} SandAgent Docker Image Builder");
+  console.log("========================");
+  console.log(`  Image: ${localImage}`);
+  console.log(`  Platform: ${opts.platform}`);
+  console.log(`  Template: ${templateName ?? "(none)"}`);
+  console.log(`  Push: ${opts.push}`);
+  console.log("");
+  ensureDocker();
+  const buildContext = join(process.cwd(), ".docker-staging");
+  mkdirSync(buildContext, { recursive: true });
+  let dockerfile = readFileSync(getShippedDockerfile(), "utf8");
+  if (templatePath && templateName) {
+    const destDir = join(buildContext, "templates", templateName);
+    mkdirSync(destDir, { recursive: true });
+    const claudeMd = join(templatePath, "CLAUDE.md");
+    if (existsSync(claudeMd))
+      copyFileSync(claudeMd, join(destDir, "CLAUDE.md"));
+    const claudeDir = join(templatePath, ".claude");
+    if (existsSync(claudeDir)) copyDirSync(claudeDir, join(destDir, ".claude"));
+    let copyLines = "\n# Template files\nRUN mkdir -p /opt/sandagent/templates";
+    if (existsSync(join(destDir, "CLAUDE.md"))) {
+      copyLines += `
+COPY templates/${templateName}/CLAUDE.md /opt/sandagent/templates/CLAUDE.md`;
+    }
+    if (existsSync(join(destDir, ".claude"))) {
+      copyLines += `
+COPY templates/${templateName}/.claude /opt/sandagent/templates/.claude`;
+    }
+    dockerfile = dockerfile.replace(/^CMD /m, `${copyLines}
+
+CMD `);
+    console.log("\u{1F9E9} Injected template files into Dockerfile");
+  }
+  writeFileSync(join(buildContext, "Dockerfile"), dockerfile);
+  console.log("\u{1F433} Building Docker image...");
+  run(
+    `docker build --platform=${opts.platform} -t ${localImage} -f ${join(buildContext, "Dockerfile")} ${buildContext}`
+  );
+  console.log(`
+\u2705 Image built: ${localImage}`);
+  if (!opts.push) return;
+  if (!localImage.includes("/")) {
+    console.error(
+      "\u274C --push requires --name to include namespace (e.g. vikadata/sandagent-seo)"
+    );
+    process.exit(1);
+  }
+  console.log("\u{1F680} Pushing image...");
+  run(`docker push ${localImage}`);
+  console.log(`
+\u2705 Image pushed: ${localImage}`);
+}
+
 // ../../packages/runner-claude/dist/ai-sdk-stream.js
 import { writeFile } from "node:fs/promises";
-import { join } from "node:path";
+import { join as join2 } from "node:path";
 var UNKNOWN_TOOL_NAME = "unknown-tool";
 function formatDataStream(data) {
   return `data: ${JSON.stringify(data)}
@@ -233,7 +360,7 @@ var AISDKStreamConverter = class {
     } finally {
       if (debugMessages.length > 0 && process.env.DEBUG === "true") {
         const debugDir = options?.cwd ?? process.cwd();
-        const debugFile = join(debugDir, `claude-message-stream-debug.json`);
+        const debugFile = join2(debugDir, `claude-message-stream-debug.json`);
         writeFile(debugFile, JSON.stringify(debugMessages, null, 2), "utf-8").catch((writeError) => {
           console.error(`[AISDKStream] Failed to write debug file:`, writeError);
         });
@@ -286,7 +413,7 @@ function createCanUseToolCallback(claudeOptions) {
           }
         } catch {
         }
-        await new Promise((resolve) => setTimeout(resolve, 500));
+        await new Promise((resolve2) => setTimeout(resolve2, 500));
       }
       try {
         fs.unlinkSync(approvalFile);
@@ -506,7 +633,7 @@ Documentation: https://platform.claude.com/docs/en/agent-sdk/typescript-v2-previ
         id: textId,
         delta: word + " "
       });
-      await new Promise((resolve) => setTimeout(resolve, 20));
+      await new Promise((resolve2) => setTimeout(resolve2, 20));
     }
     yield formatDataStream({ type: "text-end", id: textId });
     yield formatDataStream({
@@ -594,14 +721,41 @@ async function runAgent(options) {
 }
 
 // src/cli.ts
-function parseCliArgs() {
+function getSubcommand() {
+  for (let i = 2; i < process.argv.length; i++) {
+    const a = process.argv[i];
+    if (a === "--") break;
+    if (!a.startsWith("-")) return a;
+  }
+  return void 0;
+}
+function getSubSubcommand() {
+  let found = 0;
+  for (let i = 2; i < process.argv.length; i++) {
+    const a = process.argv[i];
+    if (a === "--") break;
+    if (!a.startsWith("-")) {
+      found++;
+      if (found === 2) return a;
+    }
+  }
+  return void 0;
+}
+function argsAfterPositionals(n) {
+  let found = 0;
+  for (let i = 2; i < process.argv.length; i++) {
+    if (!process.argv[i].startsWith("-") && process.argv[i] !== "--") {
+      found++;
+      if (found === n) return process.argv.slice(i + 1);
+    }
+  }
+  return [];
+}
+function parseRunArgs() {
   const { values, positionals } = parseArgs({
+    args: argsAfterPositionals(1),
     options: {
-      runner: {
-        type: "string",
-        short: "r",
-        default: "claude"
-      },
+      runner: { type: "string", short: "r", default: "claude" },
       model: {
         type: "string",
         short: "m",
@@ -612,49 +766,26 @@ function parseCliArgs() {
         short: "c",
         default: process.env.SANDAGENT_WORKSPACE ?? process.cwd()
       },
-      "system-prompt": {
-        type: "string",
-        short: "s"
-      },
-      "max-turns": {
-        type: "string",
-        short: "t"
-      },
-      "allowed-tools": {
-        type: "string",
-        short: "a"
-      },
-      resume: {
-        type: "string",
-        short: "r"
-      },
-      "output-format": {
-        type: "string",
-        short: "o"
-      },
-      help: {
-        type: "boolean",
-        short: "h"
-      }
+      "system-prompt": { type: "string", short: "s" },
+      "max-turns": { type: "string", short: "t" },
+      "allowed-tools": { type: "string", short: "a" },
+      resume: { type: "string" },
+      "output-format": { type: "string", short: "o" },
+      help: { type: "boolean", short: "h" }
     },
     allowPositionals: true,
     strict: true
   });
   if (values.help) {
-    printHelp();
+    printRunHelp();
     process.exit(0);
   }
-  if (positionals[0] !== "run") {
-    console.error('Error: Expected "run" command');
-    console.error('Usage: sandagent run [options] -- "<user input>"');
-    process.exit(1);
-  }
   const dashIndex = process.argv.indexOf("--");
   let userInput = "";
   if (dashIndex !== -1 && dashIndex < process.argv.length - 1) {
     userInput = process.argv.slice(dashIndex + 1).join(" ");
-  } else if (positionals.length > 1) {
-    userInput = positionals.slice(1).join(" ");
+  } else if (positionals.length > 0) {
+    userInput = positionals.join(" ");
   }
   if (!userInput) {
     console.error("Error: User input is required");
@@ -687,57 +818,156 @@ function parseCliArgs() {
     userInput
   };
 }
-function printHelp() {
+function parseImageBuildArgs() {
+  const { values } = parseArgs({
+    args: argsAfterPositionals(2),
+    options: {
+      name: { type: "string", default: "sandagent" },
+      tag: { type: "string", default: "latest" },
+      image: { type: "string" },
+      platform: { type: "string", default: "linux/amd64" },
+      template: { type: "string" },
+      push: { type: "boolean", default: false },
+      help: { type: "boolean", short: "h" }
+    },
+    allowPositionals: false,
+    strict: true
+  });
+  if (values.help) {
+    printImageBuildHelp();
+    process.exit(0);
+  }
+  return {
+    name: values.name,
+    tag: values.tag,
+    image: values.image,
+    platform: values.platform,
+    template: values.template,
+    push: values.push ?? false
+  };
+}
+function printRunHelp() {
   console.log(`
-\u{1F916} SandAgent Runner CLI
+\u{1F916} SandAgent Runner CLI \u2014 run
 
-Like gemini-cli or claude-code - runs locally in your terminal.
-Streams AI SDK UI messages directly to stdout.
+Runs an agent locally in your terminal, streaming AI SDK UI messages to stdout.
 
 Usage:
   sandagent run [options] -- "<user input>"
 
 Options:
-  -r, --runner <runner>        Runner to use: claude, codex, copilot (default: claude)
-  -m, --model <model>          Model to use (default: claude-sonnet-4-20250514)
-  -c, --cwd <path>             Working directory (default: current directory)
+  -r, --runner <runner>        Runner: claude, codex, copilot (default: claude)
+  -m, --model <model>          Model (default: claude-sonnet-4-20250514)
+  -c, --cwd <path>             Working directory (default: cwd)
   -s, --system-prompt <prompt> Custom system prompt
-  -t, --max-turns <n>          Maximum conversation turns
-  -a, --allowed-tools <tools>  Comma-separated list of allowed tools
-  -r, --resume <session-id>    Resume a previous session
-  -o, --output-format <format> Output format (default: stream)
-                               Available: text, json(single result), stream-json(realtime streaming), stream(ai sdk ui sse format)
-  -h, --help                   Show this help message
+  -t, --max-turns <n>          Max conversation turns
+  -a, --allowed-tools <tools>  Comma-separated allowed tools
+      --resume <session-id>    Resume a previous session
+  -o, --output-format <fmt>    text | json | stream-json | stream (default: stream)
+  -h, --help                   Show this help
+
+Environment:
+  ANTHROPIC_API_KEY            Anthropic API key (required)
+  SANDAGENT_WORKSPACE          Default workspace path
+`);
+}
+function printImageBuildHelp() {
+  console.log(`
+\u{1F433} SandAgent Runner CLI \u2014 image build
+
+Build (and optionally push) a SandAgent Docker image.
+The image includes Claude Agent SDK + runner-cli pre-installed.
 
-Environment Variables:
-  ANTHROPIC_API_KEY           Anthropic API key (required)
-  SANDAGENT_WORKSPACE         Default workspace path
-  SANDAGENT_LOG_LEVEL         Logging level (debug, info, warn, error)
+Usage:
+  sandagent image build [options]
+
+Options:
+  --name <name>          Image name, e.g. vikadata/sandagent-seo (default: sandagent)
+  --tag <tag>            Image tag (default: latest)
+  --image <full>         Full image name override (e.g. myorg/myimage:v1)
+  --platform <plat>      Build platform (default: linux/amd64)
+  --template <path>      Path to agent template directory to bake into the image
+  --push                 Push image to registry after build
+  -h, --help             Show this help
 
 Examples:
-  # Run with default settings
-  sandagent run -- "Create a hello world script"
+  sandagent image build --name vikadata/sandagent-seo --tag 0.1.0
+  sandagent image build --name vikadata/sandagent-seo --tag 0.1.0 --template ./templates/seo-agent
+  sandagent image build --name vikadata/sandagent-seo --tag 0.1.0 --template ./templates/seo-agent --push
+`);
+}
+function printImageHelp() {
+  console.log(`
+\u{1F433} SandAgent Runner CLI \u2014 image
 
-  # Run with custom system prompt
-  sandagent run --system-prompt "You are a coding assistant" -- "Build a REST API with Express"
+Manage SandAgent Docker images.
 
-  # Specify working directory
-  sandagent run --cwd ./my-project -- "Fix the bug in main.ts"
+Usage:
+  sandagent image <subcommand> [options]
+
+Subcommands:
+  build    Build (and optionally push) a Docker image
+
+Run "sandagent image build --help" for build options.
+`);
+}
+function printGlobalHelp() {
+  console.log(`
+\u{1F916} SandAgent Runner CLI
+
+Usage:
+  sandagent <command> [options]
+
+Commands:
+  run          Run an agent locally (streams AI SDK UI messages to stdout)
+  image build  Build a SandAgent Docker image (with optional --push)
+
+Run "sandagent <command> --help" for command-specific options.
 `);
 }
 async function main() {
-  const args = parseCliArgs();
-  process.chdir(args.cwd);
-  await runAgent({
-    runner: args.runner,
-    model: args.model,
-    userInput: args.userInput,
-    systemPrompt: args.systemPrompt,
-    maxTurns: args.maxTurns,
-    allowedTools: args.allowedTools,
-    resume: args.resume,
-    outputFormat: args.outputFormat
-  });
+  const sub = getSubcommand();
+  if (!sub || sub === "--help" || sub === "-h") {
+    printGlobalHelp();
+    process.exit(0);
+  }
+  switch (sub) {
+    case "run": {
+      const args = parseRunArgs();
+      process.chdir(args.cwd);
+      await runAgent({
+        runner: args.runner,
+        model: args.model,
+        userInput: args.userInput,
+        systemPrompt: args.systemPrompt,
+        maxTurns: args.maxTurns,
+        allowedTools: args.allowedTools,
+        resume: args.resume,
+        outputFormat: args.outputFormat
+      });
+      break;
+    }
+    case "image": {
+      const subSub = getSubSubcommand();
+      if (!subSub || subSub === "--help" || subSub === "-h") {
+        printImageHelp();
+        process.exit(0);
+      }
+      if (subSub === "build") {
+        const args = parseImageBuildArgs();
+        await buildImage(args);
+      } else {
+        console.error(`Unknown image subcommand: ${subSub}`);
+        printImageHelp();
+        process.exit(1);
+      }
+      break;
+    }
+    default:
+      console.error(`Unknown command: ${sub}`);
+      printGlobalHelp();
+      process.exit(1);
+  }
 }
 main().catch((error) => {
   console.error("Fatal error:", error.message);

package/dist/cli.d.ts

@@ -2,14 +2,9 @@
 /**
  * SandAgent Runner CLI
  *
- * Like gemini-cli or claude-code - runs locally in your terminal.
- * Streams AI SDK UI messages directly to stdout.
- *
- * Usage:
- *   sandagent run [options] -- "<user input>"
- *
- * The CLI is designed to be executed in a specific working directory
- * and outputs AI SDK UI messages directly.
+ * Subcommands:
+ *   sandagent run         [options] -- "<user input>"   Run an agent locally
+ *   sandagent image build [options]                     Build (and optionally push) a Docker image
  */
 export {};
 //# sourceMappingURL=cli.d.ts.map

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAEA;;;;;;;;;;;GAWG"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAEA;;;;;;GAMG"}