terminal-pilot 0.0.46 → 0.0.48

package/dist/cli.d.ts

@@ -1,5 +1,10 @@
 #!/usr/bin/env node
 import type { TerminalPilotRuntime } from "./commands/runtime.js";
+/**
+ * Rewrite pilot-level `--json` to toolcraft's `--output json`.
+ * Stop once create-session (and similar) child argv begins so nested tools keep their own `--json`.
+ */
+export declare function normalizeArgv(argv: string[]): string[];
 export declare function main(argv?: string[], options?: {
     terminalPilotRuntime?: TerminalPilotRuntime;
     packageVersion?: string;

package/dist/cli.js

@@ -1636,7 +1636,7 @@ function formatColumns(opts) {
 function formatCommandList(commands) {
   return formatColumns({
     rows: commands.map((cmd) => ({
-      left: text.command(cmd.name),
+      left: `${" ".repeat((cmd.depth ?? 0) * 2)}${text.command(cmd.name)}`,
       right: cmd.description
     }))
   });
@@ -1773,7 +1773,7 @@ function formatColumns2(opts) {
 function formatCommandList2(commands) {
   return formatColumns2({
     rows: commands.map((cmd) => ({
-      left: cmd.name,
+      left: `${" ".repeat((cmd.depth ?? 0) * 2)}${cmd.name}`,
       right: cmd.description
     }))
   });
@@ -4737,6 +4737,41 @@ async function writeErrorReport(context) {
   };
 }
 
+// ../toolcraft/src/human-in-loop/wiring.ts
+var WIRING_HINT = 'pass { humanInLoop: createHumanInLoop({ provider, ... }) } from "toolcraft/human-in-loop"';
+function assertHumanInLoopWired(root, humanInLoop) {
+  if (humanInLoop !== void 0) {
+    return;
+  }
+  const commandPath = findHumanInLoopCommandPath(root, []);
+  if (commandPath !== void 0) {
+    throw new UserError(
+      `command '${commandPath}' declares humanInLoop but no runtime is wired \u2014 ${WIRING_HINT}`
+    );
+  }
+}
+function mergeApprovalsRoot(root, options) {
+  if (options.approvals !== true) {
+    return root;
+  }
+  if (options.humanInLoop === void 0) {
+    throw new UserError(`approvals: true requires a wired humanInLoop runtime \u2014 ${WIRING_HINT}`);
+  }
+  return options.humanInLoop.mergeApprovalsGroup(root);
+}
+function findHumanInLoopCommandPath(node, path16) {
+  if (node.kind === "command") {
+    return node.humanInLoop ? path16.join(".") || node.name : void 0;
+  }
+  for (const child of node.children) {
+    const found = findHumanInLoopCommandPath(child, [...path16, child.name]);
+    if (found !== void 0) {
+      return found;
+    }
+  }
+  return void 0;
+}
+
 // ../toolcraft/src/number-schema.ts
 function isValidNumberSchemaValue(value, schema) {
   return typeof value === "number" && Number.isFinite(value) && (schema.jsonType !== "integer" || Number.isInteger(value)) && (schema.minimum === void 0 || value >= schema.minimum) && (schema.maximum === void 0 || value <= schema.maximum);
@@ -5385,8 +5420,6 @@ function validateServices(services) {
 configureTheme({ brand: "blue", label: "Toolcraft" });
 var NULL_OPTION_VALUE = /* @__PURE__ */ Symbol("toolcraft.cli.null");
 var optionalModulePaths = {
-  approvals: "./human-in-loop/approvals-commands.js",
-  humanInLoop: "./human-in-loop/gate.js",
   mcpProxy: "./mcp-proxy.js"
 };
 function importOptionalModule(specifier) {
@@ -6029,6 +6062,7 @@ function resolveCLIControls(controls) {
   validateOutputFormats(outputFormats);
   return {
     debug: controls?.debug === true,
+    help: controls?.help === "concise" ? "concise" : "extended",
     logLevel: controls?.logLevel === true,
     output: controls?.output === true || typeof controls?.output === "object",
     outputFormats,
@@ -6525,11 +6559,31 @@ function formatCommandRowName(node, casing, globalLongOptionFlags) {
   const name = parameterTokens.length === 0 ? baseName : `${baseName} ${parameterTokens.join(" ")}`;
   return name;
 }
-function formatCommandRows(group, scope, casing, globalLongOptionFlags) {
-  return getHelpChildren(group, scope).map((child) => ({
-    name: formatCommandRowName(child, casing, globalLongOptionFlags),
-    description: child.description ?? ""
-  }));
+function formatCommandRows(group, scope, casing, globalLongOptionFlags, help) {
+  if (help === "concise") {
+    return getHelpChildren(group, scope).map((child) => ({
+      name: formatCommandRowName(child, casing, globalLongOptionFlags),
+      description: child.description ?? "",
+      kind: child.kind,
+      depth: 0
+    }));
+  }
+  const rows = [];
+  const visit = (node, depth) => {
+    for (const child of getHelpChildren(node, scope)) {
+      rows.push({
+        name: formatCommandRowName(child, casing, globalLongOptionFlags),
+        description: child.description ?? "",
+        kind: child.kind,
+        depth
+      });
+      if (child.kind === "group") {
+        visit(child, depth + 1);
+      }
+    }
+  };
+  visit(group, 0);
+  return rows;
 }
 function formatGlobalOptionsLine(ctx) {
   const flags = [];
@@ -6617,7 +6671,13 @@ function renderGroupHelp(group, breadcrumb, scope, casing, globalOptions, rootUs
     globalOptions.showVersion,
     globalOptions.controls
   );
-  const commandRows = formatCommandRows(group, scope, casing, globalLongOptionFlags);
+  const commandRows = formatCommandRows(
+    group,
+    scope,
+    casing,
+    globalLongOptionFlags,
+    globalOptions.controls.help
+  );
   if (commandRows.length > 0) {
     sections.push(`${text.sectionHeader("Commands")}
 ${formatHelpCommandList(commandRows)}`);
@@ -6706,7 +6766,13 @@ function renderJsonHelp(target, root, casing, globalOptions, rootUsageName) {
   );
   const node = target.node;
   if (node.kind === "group") {
-    const commandRows = formatCommandRows(node, "cli", casing, globalLongOptionFlags);
+    const commandRows = formatCommandRows(
+      node,
+      "cli",
+      casing,
+      globalLongOptionFlags,
+      globalOptions.controls.help
+    );
     const isRoot = node === root;
     return `${JSON.stringify(
       {
@@ -6720,7 +6786,12 @@ function renderJsonHelp(target, root, casing, globalOptions, rootUsageName) {
           formatGroupUsageSuffix(node, "cli", casing, globalLongOptionFlags)
         ),
         ...node.description === void 0 ? {} : { description: node.description },
-        commands: commandRows.map((row) => ({ name: row.name, description: row.description })),
+        commands: commandRows.map((row) => ({
+          name: row.name,
+          description: row.description,
+          kind: row.kind,
+          depth: row.depth
+        })),
         options: isRoot ? collectSchemaGlobalFieldRows(node, "cli", casing, globalLongOptionFlags).map((row) => ({
           name: row.flags.split(/[ ,]+/)[0]?.replace(/^--/, "") ?? row.flags,
           flags: row.flags.split(", "),
@@ -8454,7 +8525,7 @@ function getResolvedFlags(command) {
   const flags = command.optsWithGlobals();
   return flags;
 }
-async function executeCommand(state, services, requirementOptions, runtimeFetch, runtimeOptions, runtimeEnv, runtimeFs, outputEmitter, outputFormats, promptStreams, diagnosticsOptions, onErrorReportContext) {
+async function executeCommand(state, services, requirementOptions, runtimeFetch, humanInLoop, runtimeEnv, runtimeFs, outputEmitter, outputFormats, promptStreams, diagnosticsOptions, onErrorReportContext) {
   const logger2 = createLogger(outputEmitter);
   const optionValues = state.actionCommand.optsWithGlobals();
   const resolvedFlags = optionValues;
@@ -8605,9 +8676,7 @@ async function executeCommand(state, services, requirementOptions, runtimeFetch,
           throw new UserError("Operation cancelled.");
         }
       }
-      const result = state.command.humanInLoop ? await (await importOptionalModule(
-        optionalModulePaths.humanInLoop
-      )).invokeWithHumanInLoop(state.command, context, runtimeOptions, state.commandPath) : await state.command.handler(context);
+      const result = state.command.humanInLoop && humanInLoop !== void 0 ? await humanInLoop.invoke(state.command, context, state.commandPath) : await state.command.handler(context);
       if (output === "rich" && runtime.isFixture) {
         writeRichHeader(`${state.command.name} (fixture)`);
       }
@@ -9193,20 +9262,19 @@ async function runCLI(roots, options = {}) {
   let errorReportContext;
   try {
     const normalizedRoot = normalizeRoots(roots, argv);
-    const root = options.approvals === true ? (await importOptionalModule(
-      optionalModulePaths.approvals
-    )).mergeApprovalsGroup(normalizedRoot) : normalizedRoot;
+    const root = mergeApprovalsRoot(normalizedRoot, options);
+    assertHumanInLoopWired(root, options.humanInLoop);
     if (hasMcpProxyConfig(root)) {
       await (await importOptionalModule(optionalModulePaths.mcpProxy)).resolveMcpProxies(root, { projectRoot: options.projectRoot });
     }
     const casing = options.casing ?? "kebab";
     const services = options.services ?? {};
-    const runtimeOptions = options.humanInLoop ?? {};
+    const humanInLoop = options.humanInLoop;
     const runtimeFetch = options.fetch ?? globalThis.fetch;
     version = options.version ?? findEntrypointPackageMetadata(argv[1])?.version;
     const servicesWithBuiltIns = {
       ...services,
-      runtimeOptions,
+      humanInLoop,
       root
     };
     const requirementOptions = {
@@ -9252,7 +9320,7 @@ async function runCLI(roots, options = {}) {
         servicesWithBuiltIns,
         requirementOptions,
         runtimeFetch,
-        runtimeOptions,
+        humanInLoop,
         options.env,
         options.fs,
         options.outputEmitter,
@@ -11150,6 +11218,22 @@ var gooseAgent = {
   }
 };
 
+// ../agent-defs/src/agents/pi.ts
+var piAgent = {
+  id: "pi",
+  name: "pi",
+  aliases: ["pi-agent"],
+  label: "Pi",
+  summary: "Pi coding agent (spawn-only; uses local Pi auth/settings).",
+  binaryName: "pi",
+  branding: {
+    colors: {
+      dark: "#F2F2F2",
+      light: "#242424"
+    }
+  }
+};
+
 // ../agent-defs/src/agents/poe-agent.ts
 var poeAgentAgent = {
   id: "poe-agent",
@@ -11193,6 +11277,7 @@ var allAgents = Object.freeze([
   freezeAgent(openCodeAgent),
   freezeAgent(kimiAgent),
   freezeAgent(gooseAgent),
+  freezeAgent(piAgent),
   freezeAgent(poeAgentAgent)
 ]);
 var lookup2 = /* @__PURE__ */ new Map();
@@ -14740,13 +14825,78 @@ function sleep2(ms) {
 // src/cli.ts
 configureTheme({ brand: "green", label: "Terminal Pilot" });
 function getBundledPackageVersion() {
-  return true ? "0.0.46" : void 0;
-}
+  return true ? "0.0.48" : void 0;
+}
+var pilotOptionsWithValues = /* @__PURE__ */ new Set([
+  "--session",
+  "-s",
+  "--cwd",
+  "--cols",
+  "--rows",
+  "--timeout",
+  "-t",
+  "--last",
+  "-n",
+  "--output",
+  "-o",
+  "--scope",
+  "--padding",
+  "-p",
+  "--log-level",
+  "--preset",
+  "--signal"
+]);
 function normalizeArgv(argv) {
-  if (argv.includes("--json") && !argv.some((argument) => argument === "--output" || argument.startsWith("--output="))) {
-    return argv.flatMap((argument) => argument === "--json" ? ["--output", "json"] : [argument]);
+  if (!argv.includes("--json")) {
+    return argv;
+  }
+  if (argv.some((argument) => argument === "--output" || argument.startsWith("--output="))) {
+    return argv;
+  }
+  const normalized = [];
+  let index = 0;
+  let bareTokenCount = 0;
+  let expectOptionValue = false;
+  while (index < argv.length) {
+    const token = argv[index];
+    if (index < 2) {
+      normalized.push(token);
+      index += 1;
+      continue;
+    }
+    if (token === "--") {
+      normalized.push(token, ...argv.slice(index + 1));
+      break;
+    }
+    if (expectOptionValue) {
+      normalized.push(token);
+      expectOptionValue = false;
+      index += 1;
+      continue;
+    }
+    if (token === "--json") {
+      normalized.push("--output", "json");
+      index += 1;
+      continue;
+    }
+    if (token.startsWith("-") && token !== "-") {
+      normalized.push(token);
+      const optionName = token.includes("=") ? token.slice(0, token.indexOf("=")) : token;
+      if (!token.includes("=") && (pilotOptionsWithValues.has(optionName) || optionName === "--debug" && argv[index + 1] !== void 0 && !argv[index + 1].startsWith("-"))) {
+        expectOptionValue = true;
+      }
+      index += 1;
+      continue;
+    }
+    bareTokenCount += 1;
+    if (bareTokenCount >= 2) {
+      normalized.push(...argv.slice(index));
+      break;
+    }
+    normalized.push(token);
+    index += 1;
   }
-  return argv;
+  return normalized;
 }
 async function main(argv = process.argv, options = {}) {
   if (isTerminalPilotDaemonArgv(argv)) {
@@ -14793,6 +14943,7 @@ if (await isDirectExecution(process.argv)) {
   await main();
 }
 export {
-  main
+  main,
+  normalizeArgv
 };
 //# sourceMappingURL=cli.js.map