@townco/cli 0.1.82 → 0.1.84

package/dist/index.js

@@ -1,111 +1,24 @@
 #!/usr/bin/env bun
-import fs from "node:fs";
-import afs from "node:fs/promises";
-import { join } from "node:path";
-import { argument, command, constant, flag, multiple, object, option, optional, or, } from "@optique/core";
+import { command, constant, or } from "@optique/core";
 import { message } from "@optique/core/message";
-import { integer, string } from "@optique/core/valueparser";
 import { run } from "@optique/run";
-import { initForClaudeCode } from "@townco/agent/scaffold";
-import { isInsideTownProject } from "@townco/agent/storage";
-import { findRoot } from "@townco/core";
-import { updateSchema as updateEnvSchema } from "@townco/env/update-schema";
-import { createSecret, deleteSecret, genenv, listSecrets, updateSecret, } from "@townco/secret";
-import { createTRPCClient, httpLink, httpSubscriptionLink, splitLink, } from "@trpc/client";
-import archiver from "archiver";
-import { EventSource } from "eventsource";
-import walk from "ignore-walk";
-import inquirer from "inquirer";
-import superjson from "superjson";
 import { match } from "ts-pattern";
-import { batchCommand } from "./commands/batch.js";
-import { configureCommand } from "./commands/configure.js";
-import { createCommand } from "./commands/create.js";
-import { createProjectCommand } from "./commands/create-project.js";
-import { loginCommand } from "./commands/login.js";
-import { runCommand } from "./commands/run.js";
-import { upgradeCommand } from "./commands/upgrade.js";
-import { whoamiCommand } from "./commands/whoami.js";
-import { getValidCredentials } from "./lib/auth-fetch";
-/**
- * Securely prompt for a secret value without echoing to the terminal
- */
-const promptSecret = async (secretName) => {
-    const answers = await inquirer.prompt([
-        {
-            type: "password",
-            name: "value",
-            message: `Enter value for secret '${secretName}':`,
-            mask: "*",
-        },
-    ]);
-    return answers.value;
-};
-const parser = or(command("deploy", object({
-    command: constant("deploy"),
-    agent: option("-a", "--agent", string()),
-}), {
-    brief: message `Deploy agents.`,
-    description: message `Deploy agents to the Town cloud.`,
-}), command("configure", constant("configure"), {
+import batchCmd from "@/commands/batch-wrapper";
+import { configureCommand } from "@/commands/configure";
+import createCmd from "@/commands/create-wrapper";
+import deployCmd from "@/commands/deploy";
+import { loginCommand } from "@/commands/login";
+import runCmd from "@/commands/run-wrapper";
+import secretCmd from "@/commands/secret";
+import { upgradeCommand } from "@/commands/upgrade";
+import { whoamiCommand } from "@/commands/whoami";
+const parser = or(batchCmd.def, command("configure", constant("configure"), {
     brief: message `Configure environment variables.`,
-}), command("login", constant("login"), {
-    brief: message `Log in to Town Shed.`,
+}), command("login", constant("login"), { brief: message `Log in to Town Shed.` }), command("upgrade", constant("upgrade"), {
+    brief: message `Upgrade dependencies by cleaning and reinstalling.`,
 }), command("whoami", constant("whoami"), {
     brief: message `Show current login status.`,
-}), command("upgrade", constant("upgrade"), {
-    brief: message `Upgrade dependencies by cleaning and reinstalling.`,
-}), command("create", object({
-    command: constant("create"),
-    name: optional(option("-n", "--name", string())),
-    model: optional(option("-m", "--model", string())),
-    tools: multiple(option("-t", "--tool", string())),
-    systemPrompt: optional(option("-p", "--prompt", string())),
-    init: optional(option("--init", string())),
-    claude: optional(flag("--claude")),
-}), {
-    brief: message `Create a new agent or project (with --init <path>). Use --claude to add Claude Code integration.`,
-}), command("run", object({
-    command: constant("run"),
-    name: argument(string({ metavar: "NAME" })),
-    http: optional(flag("--http")),
-    gui: optional(flag("--gui")),
-    cli: optional(flag("--cli")),
-    prompt: optional(argument(string({ metavar: "PROMPT" }))),
-    port: optional(option("-p", "--port", integer())),
-    noSession: optional(flag("--no-session")),
-}), { brief: message `Run an agent.` }), command("batch", object({
-    command: constant("batch"),
-    name: argument(string({ metavar: "NAME" })),
-    queries: multiple(argument(string({ metavar: "QUERY" }))),
-    file: optional(option("-f", "--file", string())),
-    concurrency: optional(option("-c", "--concurrency", integer())),
-    port: optional(option("-p", "--port", integer())),
-}), {
-    brief: message `Run multiple queries in parallel against an agent.`,
-    description: message `Run multiple queries in parallel, each in its own session. Queries can be provided as arguments or loaded from a file.`,
-}), command("secret", object({
-    command: constant("secret"),
-    subcommand: or(command("list", object({ action: constant("list") }), {
-        brief: message `List secrets.`,
-    }), command("add", object({
-        action: constant("add"),
-        name: argument(string({ metavar: "NAME" })),
-        value: optional(argument(string({ metavar: "VALUE" }))),
-    }), { brief: message `Add a secret.` }), command("update", object({
-        action: constant("update"),
-        name: optional(argument(string({ metavar: "NAME" }))),
-        value: optional(argument(string({ metavar: "VALUE" }))),
-        genenv: optional(flag("-g", "--genenv", {
-            description: message `Regenerate .env file.`,
-        })),
-    }), { brief: message `Update a secret.` }), command("remove", object({
-        action: constant("remove"),
-        name: argument(string({ metavar: "NAME" })),
-    }), { brief: message `Remove a secret.` }), command("genenv", object({ action: constant("genenv") }), {
-        brief: message `Generate .env file.`,
-    })),
-}), { brief: message `Secrets management.` }));
+}), createCmd.def, deployCmd.def, runCmd.def, secretCmd.def);
 const meta = {
     programName: "town",
     help: "both",
@@ -115,245 +28,15 @@ const meta = {
     description: message `Town CLI is a first-class command-line experience for working with Town Agents.`,
 };
 const main = async (parser, meta) => await match(run(parser, meta))
-    .with("login", loginCommand)
-    .with("whoami", whoamiCommand)
-    .with({ command: "deploy" }, async ({ agent }) => {
-    const projectRoot = await isInsideTownProject();
-    if (!projectRoot)
-        throw new Error("Not inside a Town project");
-    if (!(await afs.exists(join(projectRoot, "agents", agent))))
-        throw new Error(`Agent ${agent} not found`);
-    const { accessToken, shedUrl } = await getValidCredentials();
-    const authHeader = { Authorization: `Bearer ${accessToken}` };
-    const url = `${shedUrl}/api/trpc`;
-    const baseLinkOpts = { url, transformer: superjson };
-    const client = createTRPCClient({
-        links: [
-            splitLink({
-                condition: (op) => op.type === "subscription",
-                true: httpSubscriptionLink({
-                    ...baseLinkOpts,
-                    EventSource,
-                    eventSourceOptions: {
-                        fetch: async (url, init) => fetch(url, {
-                            ...init,
-                            headers: { ...init.headers, ...authHeader },
-                        }),
-                    },
-                }),
-                false: httpLink({ ...baseLinkOpts, headers: authHeader }),
-            }),
-        ],
-    });
-    console.log("Creating archive...");
-    const root = await findRoot({ rootMarker: "package.json" });
-    const arc = archiver("tar", { gzip: true });
-    const chunks = [];
-    const done = new Promise((ok, err) => {
-        arc.on("data", (chunk) => chunks.push(chunk));
-        arc.on("end", () => ok(Buffer.concat(chunks)));
-        arc.on("error", err);
-    });
-    (await walk({ path: root, ignoreFiles: [".gitignore"] }))
-        .filter((path) => path.split("/")[0] !== ".git")
-        .forEach((path) => {
-        if (!fs.statSync(path).isFile())
-            return;
-        arc.append(fs.createReadStream(path), { name: path });
-    });
-    arc.finalize();
-    console.log("Uploading archive...");
-    const { sha256, cached } = await client.uploadArchive.mutate(await done);
-    console.log(`Archive uploaded: ${sha256} (${cached ? "cached" : "new"})`);
-    console.log("Deploying...");
-    client.deploy.subscribe({ sha256, agent, shedUrl }, {
-        onData: ({ status, error }) => console.log(status ? status : error),
-        onError: (err) => console.error(err),
-        onComplete: () => console.log("\n✓ Deployment complete!"),
-    });
-})
     .with("configure", configureCommand)
+    .with("login", loginCommand)
     .with("upgrade", upgradeCommand)
-    .with({ command: "create" }, async ({ name, model, tools, systemPrompt, init, claude }) => {
-    // Handle --claude flag (initialize .claude in existing project)
-    if (claude === true) {
-        if (init !== null && init !== undefined) {
-            console.error("Error: --claude flag is redundant with --init (projects include .claude by default)");
-            process.exit(1);
-        }
-        // Check if we're in a Town project
-        const projectRoot = await isInsideTownProject();
-        if (projectRoot === null) {
-            console.error("Error: Not inside a Town project. Use 'town create --init <path>' to create a new project.");
-            process.exit(1);
-        }
-        // Initialize .claude directory only
-        await initForClaudeCode(projectRoot);
-        console.log("\n✓ Claude Code workspace initialized successfully!");
-        return;
-    }
-    // Check if --init flag is present for project scaffolding
-    if (init !== null && init !== undefined) {
-        // Project mode - scaffold a standalone project
-        await createProjectCommand({
-            path: init,
-        });
-    }
-    else {
-        // Check if we're inside a Town project
-        const projectRoot = await isInsideTownProject();
-        if (projectRoot === null) {
-            // Not in a project - prompt user to initialize
-            const answer = await inquirer.prompt([
-                {
-                    type: "confirm",
-                    name: "initProject",
-                    message: "Not inside a Town project. Initialize project in current directory?",
-                    default: true,
-                },
-            ]);
-            if (answer.initProject) {
-                // Initialize project first
-                await createProjectCommand({ path: process.cwd() });
-                // Then create agent
-                await createCommand({
-                    ...(name !== undefined && { name }),
-                    ...(model !== undefined && { model }),
-                    ...(tools.length > 0 && { tools }),
-                    ...(systemPrompt !== undefined && { systemPrompt }),
-                    agentsDir: join(process.cwd(), "agents"),
-                });
-            }
-            else {
-                // User declined
-                console.log("\nPlease run 'town create' inside a project directory, or run:\n" +
-                    "  town create --init <path>\n" +
-                    "to create a project.");
-                process.exit(1);
-            }
-        }
-        else {
-            // Agent mode - create agent in existing project
-            // Create command starts a long-running Ink session
-            await createCommand({
-                ...(name !== undefined && { name }),
-                ...(model !== undefined && { model }),
-                ...(tools.length > 0 && { tools }),
-                ...(systemPrompt !== undefined && { systemPrompt }),
-                agentsDir: join(projectRoot, "agents"),
-            });
-        }
-    }
-})
-    .with({ command: "run" }, async ({ name, http, gui, cli, prompt, port, noSession }) => {
-    const options = {
-        name,
-        http: http === true,
-        gui: gui === true,
-        cli: cli === true,
-        noSession: noSession === true,
-    };
-    if (prompt !== null && prompt !== undefined) {
-        options.prompt = prompt;
-    }
-    if (port !== null && port !== undefined) {
-        options.port = port;
-    }
-    await runCommand(options);
-})
-    .with({ command: "batch" }, async ({ name, queries, file, concurrency, port }) => {
-    const options = {
-        name,
-    };
-    if (queries.length > 0) {
-        options.queries = [...queries]; // Convert readonly array to mutable
-    }
-    if (file !== null && file !== undefined) {
-        options.file = file;
-    }
-    if (concurrency !== null && concurrency !== undefined) {
-        options.concurrency = concurrency;
-    }
-    if (port !== null && port !== undefined) {
-        options.port = port;
-    }
-    await batchCommand(options);
-})
-    .with({ command: "secret" }, async ({ subcommand }) => {
-    await match(subcommand)
-        .with({ action: "list" }, async () => {
-        const truncate = (str, maxLength = 50) => {
-            if (str.length <= maxLength)
-                return str;
-            return `${str.slice(0, maxLength - 3)}...`;
-        };
-        console.table((await listSecrets()).map((secret) => ({
-            Key: secret.key,
-            Valid: secret.valid ? "✓" : "✗",
-            Error: truncate(secret.error ?? ""),
-        })));
-    })
-        .with({ action: "add" }, async ({ name, value }) => {
-        // If value is not provided, prompt securely
-        const secretValue = value ?? (await promptSecret(name));
-        if (!secretValue) {
-            console.error("Error: Secret value cannot be empty");
-            process.exit(1);
-        }
-        await createSecret(name, secretValue);
-        await updateEnvSchema();
-        console.log(`Secret '${name}' added successfully (& @packages/env schema updated).`);
-    })
-        .with({ action: "update" }, async ({ name, value, genenv: regen }) => {
-        let secretName = name;
-        // If name is not provided, show a list prompt to select from existing secrets
-        if (!secretName) {
-            const secrets = await listSecrets();
-            if (secrets.length === 0) {
-                console.error("No secrets found to update.");
-                process.exit(1);
-            }
-            const answer = await inquirer.prompt([
-                {
-                    type: "list",
-                    name: "selectedSecret",
-                    message: "Select a secret to update:",
-                    choices: secrets.map((s) => ({
-                        name: `${s.key} ${s.valid ? "✓" : "✗"}`,
-                        value: s.key,
-                    })),
-                },
-            ]);
-            secretName = answer.selectedSecret;
-        }
-        // If value is not provided, prompt securely
-        if (!secretName) {
-            console.error("Error: Secret name is required");
-            process.exit(1);
-        }
-        const secretValue = value ?? (await promptSecret(secretName));
-        if (!secretValue) {
-            console.error("Error: Secret value cannot be empty");
-            process.exit(1);
-        }
-        await updateSecret(secretName, secretValue);
-        console.log(`Secret '${secretName}' updated successfully.`);
-        if (regen) {
-            await genenv();
-            console.log(".env file generated successfully.");
-        }
-    })
-        .with({ action: "remove" }, async ({ name }) => {
-        await deleteSecret(name);
-        await updateEnvSchema();
-        console.log(`Secret '${name}' removed successfully (& @packages/env schema updated).`);
-    })
-        .with({ action: "genenv" }, async () => {
-        await genenv();
-        console.log(".env file generated successfully.");
-    })
-        .exhaustive();
-})
+    .with("whoami", whoamiCommand)
+    .with({ command: "batch" }, batchCmd.impl)
+    .with({ command: "create" }, createCmd.impl)
+    .with({ command: "deploy" }, deployCmd.impl)
+    .with({ command: "run" }, runCmd.impl)
+    .with({ command: "secret" }, secretCmd.impl)
     .exhaustive();
 main(parser, meta).catch((error) => {
     console.error("Error:", error);

package/dist/lib/command.d.ts

@@ -0,0 +1,8 @@
+import type { InferValue } from "@optique/core";
+export declare const createCommand: <T extends import("@optique/core").Parser<unknown, ["matched", string] | ["parsing", unknown] | undefined>>({ def, impl, }: {
+    def: T;
+    impl: (def: InferValue<T>) => unknown;
+}) => {
+    def: T;
+    impl: (def: InferValue<T>) => unknown;
+};

package/dist/lib/command.js

@@ -0,0 +1 @@
+export const createCommand = ({ def, impl, }) => ({ def, impl });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@townco/cli",
-  "version": "0.1.82",
+  "version": "0.1.84",
   "type": "module",
   "bin": {
     "town": "./dist/index.js"
@@ -11,11 +11,11 @@
   ],
   "repository": "github:townco/town",
   "scripts": {
-    "check": "tsc --noEmit",
-    "build": "tsc"
+    "check": "tsgo --noEmit",
+    "build": "tsgo"
   },
   "devDependencies": {
-    "@townco/tsconfig": "0.1.74",
+    "@townco/tsconfig": "0.1.76",
     "@types/archiver": "^7.0.0",
     "@types/bun": "^1.3.1",
     "@types/ignore-walk": "^4.0.3",
@@ -25,26 +25,22 @@
   "dependencies": {
     "@optique/core": "^0.6.2",
     "@optique/run": "^0.6.2",
-    "@townco/agent": "0.1.82",
-    "@townco/core": "0.0.55",
-    "@townco/debugger": "0.1.32",
-    "@townco/env": "0.1.27",
-    "@townco/secret": "0.1.77",
-    "@townco/ui": "0.1.77",
+    "@townco/agent": "0.1.84",
+    "@townco/core": "0.0.57",
+    "@townco/debugger": "0.1.34",
+    "@townco/env": "0.1.29",
+    "@townco/secret": "0.1.79",
+    "@townco/ui": "0.1.79",
     "@trpc/client": "^11.7.2",
-    "@types/inquirer": "^9.0.9",
-    "@types/ws": "^8.5.13",
     "archiver": "^7.0.1",
     "eventsource": "^4.1.0",
-    "ignore": "^7.0.5",
     "ignore-walk": "^8.0.0",
     "ink": "^6.4.0",
     "ink-text-input": "^6.0.0",
     "inquirer": "^12.10.0",
     "open": "^10.2.0",
     "superjson": "^2.2.5",
-    "ts-pattern": "^5.9.0",
-    "ws": "^8.18.0"
+    "ts-pattern": "^5.9.0"
   },
   "peerDependencies": {
     "react": ">=19.0.0"