@getpochi/cli 0.6.3 → 0.6.5

package/dist/cli.js

@@ -133488,13 +133488,13 @@ var init_Entity = __esm(() => {
     get client() {
       return shardingTag.pipe(flatMap15((sharding) => sharding.makeClient(this)));
     },
-    toLayer(build5, options12) {
-      return shardingTag.pipe(flatMap15((sharding) => sharding.registerEntity(this, isEffect2(build5) ? build5 : succeed11(build5), options12)), scopedDiscard2);
+    toLayer(build4, options12) {
+      return shardingTag.pipe(flatMap15((sharding) => sharding.registerEntity(this, isEffect2(build4) ? build4 : succeed11(build4), options12)), scopedDiscard2);
     },
     of: identity,
-    toLayerMailbox(build5, options12) {
+    toLayerMailbox(build4, options12) {
       const buildHandlers = gen4(this, function* () {
-        const behaviour = isEffect2(build5) ? yield* build5 : build5;
+        const behaviour = isEffect2(build4) ? yield* build4 : build4;
         const mailbox = yield* make80();
         const handler2 = (envelope) => {
           return async((resume2) => {
@@ -135063,14 +135063,14 @@ var init_Sharding = __esm(() => {
     const context15 = yield* context3();
     const reaper = yield* EntityReaper;
     const entityManagerLatches = new Map;
-    const registerEntity = fnUntraced2(function* (entity, build5, options12) {
+    const registerEntity = fnUntraced2(function* (entity, build4, options12) {
       if (isNone2(config5.runnerAddress) || entityManagers.has(entity.type))
         return;
       const scope5 = yield* scope3;
       yield* addFinalizer2(scope5, sync6(() => {
         state2.status = "closed";
       }));
-      const manager = yield* make178(entity, build5, {
+      const manager = yield* make178(entity, build4, {
         ...options12,
         storage,
         runnerAddress: config5.runnerAddress.value,
@@ -172750,7 +172750,7 @@ var require_main2 = __commonJS((exports, module) => {
   __export3(node_exports, {
     analyzeMetafile: () => analyzeMetafile,
     analyzeMetafileSync: () => analyzeMetafileSync,
-    build: () => build5,
+    build: () => build4,
     buildSync: () => buildSync,
     context: () => context15,
     default: () => node_default,
@@ -174725,7 +174725,7 @@ More information: The file containing the code for esbuild's JavaScript API (${_
     }
   };
   var version4 = "0.25.9";
-  var build5 = (options14) => ensureServiceIsRunning().build(options14);
+  var build4 = (options14) => ensureServiceIsRunning().build(options14);
   var context15 = (buildOptions) => ensureServiceIsRunning().context(buildOptions);
   var transform14 = (input, options14) => ensureServiceIsRunning().transform(input, options14);
   var formatMessages2 = (messages, options14) => ensureServiceIsRunning().formatMessages(messages, options14);
@@ -175217,7 +175217,7 @@ function build$1(options14, isSynchronous) {
   else
     return isSynchronous ? defaultSync : defaultAsync;
 }
-function build5(isSynchronous) {
+function build4(isSynchronous) {
   return isSynchronous ? walkSync : walkAsync;
 }
 function promise5(root2, options14) {
@@ -175411,7 +175411,7 @@ var __require3, SLASHES_REGEX, WINDOWS_ROOT_DIR_REGEX, pushDirectory = (director
     this.getArray = build$4(options14);
     this.groupFiles = build$3(options14);
     this.resolveSymlink = build$2(options14, this.isSynchronous);
-    this.walkDirectory = build5(this.isSynchronous);
+    this.walkDirectory = build4(this.isSynchronous);
   }
   start() {
     this.pushDirectory(this.root, this.state.paths, this.state.options.filters);
@@ -178023,7 +178023,7 @@ var require_main3 = __commonJS((exports, module) => {
   __export3(node_exports, {
     analyzeMetafile: () => analyzeMetafile,
     analyzeMetafileSync: () => analyzeMetafileSync,
-    build: () => build6,
+    build: () => build5,
     buildSync: () => buildSync,
     context: () => context15,
     default: () => node_default,
@@ -179998,7 +179998,7 @@ More information: The file containing the code for esbuild's JavaScript API (${_
     }
   };
   var version4 = "0.25.1";
-  var build6 = (options14) => ensureServiceIsRunning().build(options14);
+  var build5 = (options14) => ensureServiceIsRunning().build(options14);
   var context15 = (buildOptions) => ensureServiceIsRunning().context(buildOptions);
   var transform14 = (input, options14) => ensureServiceIsRunning().transform(input, options14);
   var formatMessages2 = (messages, options14) => ensureServiceIsRunning().formatMessages(messages, options14);
@@ -186739,16 +186739,16 @@ var require_babel = __commonJS((exports, module) => {
             if (maps[i8].sources.length > 1)
               throw new Error(`Transformation map ${i8} must have exactly one source file.
 Did you specify these with the most recent transformation maps first?`);
-          let tree = build6(map52, loader, "", 0);
+          let tree = build5(map52, loader, "", 0);
           for (let i8 = maps.length - 1;i8 >= 0; i8--)
             tree = MapSource(maps[i8], [tree]);
           return tree;
         }
-        function build6(map52, loader, importer, importerDepth) {
+        function build5(map52, loader, importer, importerDepth) {
           const { resolvedSources, sourcesContent, ignoreList } = map52, depth = importerDepth + 1;
           return MapSource(map52, resolvedSources.map((sourceFile, i8) => {
             const ctx = { importer, depth, source: sourceFile || "", content: undefined, ignore: undefined }, sourceMap = loader(ctx.source, ctx), { source, content: content3, ignore: ignore7 } = ctx;
-            return sourceMap ? build6(new traceMapping.TraceMap(sourceMap, source), loader, source, depth) : OriginalSource(source, content3 !== undefined ? content3 : sourcesContent ? sourcesContent[i8] : null, ignore7 !== undefined ? ignore7 : !!ignoreList && ignoreList.includes(i8));
+            return sourceMap ? build5(new traceMapping.TraceMap(sourceMap, source), loader, source, depth) : OriginalSource(source, content3 !== undefined ? content3 : sourcesContent ? sourcesContent[i8] : null, ignore7 !== undefined ? ignore7 : !!ignoreList && ignoreList.includes(i8));
           }));
         }
 
@@ -191124,10 +191124,10 @@ See https://babeljs.io/docs/configuration#print-effective-configs for more info.
       }
       Object.defineProperty(exports2, "__esModule", { value: true }), exports2.default = function(allowlist, outputType = "global") {
         let tree;
-        const build6 = { global: buildGlobal, module: buildModule, umd: buildUmd, var: buildVar }[outputType];
-        if (!build6)
+        const build5 = { global: buildGlobal, module: buildModule, umd: buildUmd, var: buildVar }[outputType];
+        if (!build5)
           throw new Error(`Unsupported output type ${outputType}`);
-        tree = build6(allowlist);
+        tree = build5(allowlist);
         return (0, _generator().default)(tree).code;
       };
       const { arrayExpression: arrayExpression2, assignmentExpression: assignmentExpression2, binaryExpression: binaryExpression2, blockStatement: blockStatement2, callExpression: callExpression2, cloneNode, conditionalExpression: conditionalExpression2, exportNamedDeclaration: exportNamedDeclaration2, exportSpecifier: exportSpecifier2, expressionStatement: expressionStatement2, functionExpression: functionExpression2, identifier: identifier3, memberExpression: memberExpression2, objectExpression: objectExpression2, program: program4, stringLiteral, unaryExpression: unaryExpression2, variableDeclaration: variableDeclaration2, variableDeclarator: variableDeclarator2 } = _t(), buildUmdWrapper = (replacements2) => _template().default.statement`
@@ -362928,7 +362928,7 @@ function build$13(options14, isSynchronous) {
   else
     return isSynchronous ? defaultSync2 : defaultAsync2;
 }
-function build7(isSynchronous) {
+function build6(isSynchronous) {
   return isSynchronous ? walkSync2 : walkAsync2;
 }
 function promise6(root3, options14) {
@@ -363122,7 +363122,7 @@ var __require5, SLASHES_REGEX2, WINDOWS_ROOT_DIR_REGEX2, pushDirectory2 = (direc
     this.getArray = build$42(options14);
     this.groupFiles = build$32(options14);
     this.resolveSymlink = build$23(options14, this.isSynchronous);
-    this.walkDirectory = build7(this.isSynchronous);
+    this.walkDirectory = build6(this.isSynchronous);
   }
   start() {
     this.pushDirectory(this.root, this.state.paths, this.state.options.filters);
@@ -441631,7 +441631,7 @@ var require_colors = __commonJS((exports, module) => {
     }
     return str.replace(matchOperatorsRe, "\\$&");
   };
-  function build9(_styles) {
+  function build8(_styles) {
     var builder = function builder() {
       return applyStyle2.apply(builder, arguments);
     };
@@ -441646,7 +441646,7 @@ var require_colors = __commonJS((exports, module) => {
       ansiStyles2[key].closeRe = new RegExp(escapeStringRegexp3(ansiStyles2[key].close), "g");
       ret[key] = {
         get: function() {
-          return build9(this._styles.concat(key));
+          return build8(this._styles.concat(key));
         }
       };
     });
@@ -441705,7 +441705,7 @@ var require_colors = __commonJS((exports, module) => {
     Object.keys(styles3).forEach(function(name17) {
       ret[name17] = {
         get: function() {
-          return build9([name17]);
+          return build8([name17]);
         }
       };
     });
@@ -447848,8 +447848,8 @@ var require_coerce = __commonJS((exports, module) => {
     const minor = match33[3] || "0";
     const patch25 = match33[4] || "0";
     const prerelease = options14.includePrerelease && match33[5] ? `-${match33[5]}` : "";
-    const build9 = options14.includePrerelease && match33[6] ? `+${match33[6]}` : "";
-    return parse30(`${major}.${minor}.${patch25}${prerelease}${build9}`, options14);
+    const build10 = options14.includePrerelease && match33[6] ? `+${match33[6]}` : "";
+    return parse30(`${major}.${minor}.${patch25}${prerelease}${build10}`, options14);
   };
   module.exports = coerce3;
 });
@@ -493638,7 +493638,7 @@ class BrowserSessionStore {
 // package.json
 var package_default = {
   name: "@getpochi/cli",
-  version: "0.6.3",
+  version: "0.6.5",
   devDependencies: {
     "@commander-js/extra-typings": "^14.0.0",
     "@getpochi/common": "workspace:*",
@@ -495979,7 +495979,11 @@ var materializers2 = exports_mod6.SQLite.materializers(events, {
     data: message
   }).where({ id: message.id })),
   "v1.ForkTaskInited": ({ tasks, messages, files }) => [
-    ...tasks.map((task) => tables.tasks.insert({ ...task, updatedAt: task.createdAt })),
+    ...tasks.map((task) => tables.tasks.insert({
+      ...task,
+      shareId: task.parentId ? undefined : `p-${task.id.replaceAll("-", "")}`,
+      updatedAt: task.createdAt
+    })),
     ...messages.map((message) => tables.messages.insert(message)),
     ...files.map((file7) => tables.files.insert(file7))
   ]
@@ -497718,143 +497722,10 @@ end
 complete -f -d 'pochi' -c pochi -a "(eval _pochi_completion)"
 ###-end-pochi-completion-###
 `;
-// src/json-renderer.ts
-var runExclusive2 = __toESM(require_runExclusive(), 1);
-
-class JsonRenderer {
-  stream;
-  store;
-  blobStore;
-  state;
-  outputMessageIds = new Set;
-  lastMessageCount = 0;
-  mode;
-  attemptCompletionSchemaOverride;
-  constructor(stream15, store, blobStore, state2, options7 = { mode: "full" }) {
-    this.stream = stream15;
-    this.store = store;
-    this.blobStore = blobStore;
-    this.state = state2;
-    this.mode = options7.mode;
-    this.attemptCompletionSchemaOverride = !!options7.attemptCompletionSchemaOverride;
-    if (this.mode === "full") {
-      this.state.signal.messages.subscribe(runExclusive2.build(async (messages) => {
-        if (messages.length > this.lastMessageCount) {
-          await this.outputMessages(messages.slice(0, -1));
-          this.lastMessageCount = messages.length;
-        }
-      }));
-    }
-  }
-  async shutdown() {
-    if (this.mode === "result-only") {
-      this.outputResult();
-    } else {
-      await this.outputMessages(this.state.signal.messages.value);
-      await this.outputFilesData();
-    }
-  }
-  outputResult() {
-    const messages = this.state.signal.messages.value;
-    const lastMessage = messages.at(-1);
-    if (lastMessage?.role === "assistant") {
-      for (const part of lastMessage.parts || []) {
-        if (isToolUIPart(part) && part.type === "tool-attemptCompletion") {
-          if (part.input) {
-            const input = part.input;
-            if (this.attemptCompletionSchemaOverride) {
-              this.stream.write(`${JSON.stringify(input.result, null, 2)}
-`);
-            } else {
-              this.stream.write(`${input.result}
-`);
-            }
-          }
-          return;
-        }
-      }
-    }
-  }
-  async outputMessages(messages) {
-    for (const message of messages) {
-      if (!this.outputMessageIds.has(message.id)) {
-        let outputMessage = await inlineSubTask(this.store, message);
-        outputMessage = await mapStoreBlob(this.blobStore, outputMessage);
-        this.stream.write(`${JSON.stringify(outputMessage)}
-`);
-        this.outputMessageIds.add(message.id);
-      }
-    }
-  }
-  async outputFilesData() {
-    const files = this.store.query(defaultCatalog.queries.makeStoreFilesQuery());
-    if (files.length > 0) {
-      const data = {
-        type: "files",
-        files
-      };
-      this.stream.write(`${JSON.stringify(data)}
-`);
-    }
-  }
-}
-async function inlineSubTask(store, message) {
-  const partsWithSubtasks = message.parts.map((part) => {
-    if (part.type === "tool-newTask" && part.state !== "input-streaming") {
-      const input = part.input;
-      const subtaskId = input._meta?.uid;
-      if (subtaskId) {
-        const subtask = store.query(defaultCatalog.queries.makeTaskQuery(subtaskId));
-        const subtaskMessages = store.query(defaultCatalog.queries.makeMessagesQuery(subtaskId));
-        if (subtask) {
-          return {
-            ...part,
-            input: {
-              ...input,
-              _transient: {
-                task: {
-                  clientTaskId: subtaskId,
-                  messages: subtaskMessages.map((m) => m.data),
-                  todos: subtask.todos.map((t5) => ({ ...t5 }))
-                }
-              }
-            }
-          };
-        }
-      }
-    }
-    return part;
-  });
-  return {
-    ...message,
-    parts: partsWithSubtasks
-  };
-}
-async function mapStoreBlob(store, o6) {
-  if (t3(o6) && o6.startsWith(store.protocol)) {
-    const blob3 = await store.get(o6);
-    if (!blob3)
-      throw new Error(`Store blob not found at "${o6}"`);
-    const base643 = Buffer.from(blob3.data).toString("base64");
-    return `data:${blob3.mimeType};base64,${base643}`;
-  }
-  if (o5(o6)) {
-    return Promise.all(o6.map((el) => mapStoreBlob(store, el)));
-  }
-  if (o4(o6)) {
-    const entires = await Promise.all(t4(o6).map(async ([k2, v2]) => [
-      k2,
-      await mapStoreBlob(store, v2)
-    ]));
-    return n2(entires);
-  }
-  return o6;
-}
-
 // src/lib/ffmpeg-mjpeg-to-mp4.ts
 import { PassThrough } from "node:stream";
 var import_fluent_ffmpeg = __toESM(require_fluent_ffmpeg(), 1);
-var runExclusive3 = __toESM(require_runExclusive(), 1);
+var runExclusive2 = __toESM(require_runExclusive(), 1);
 var logger15 = getLogger("MjpegToMp4");
 function setFfmpegPath(path5) {
   import_fluent_ffmpeg.default.setFfmpegPath(path5);
@@ -497920,7 +497791,7 @@ function startMjpegToMp4Converter(outputPath, opts = {}) {
   command.on("error", (err) => logger15.debug("[ffmpeg] error:", err));
   command.on("end", () => logger15.debug("[ffmpeg] end"));
   command.run();
-  const writeRepeatedFrames = runExclusive3.build(async (jpeg, repeat6) => {
+  const writeRepeatedFrames = runExclusive2.build(async (jpeg, repeat6) => {
     for (let i6 = 0;i6 < repeat6; i6++) {
       if (!mjpegStream.write(jpeg)) {
         await new Promise((r6) => mjpegStream.once("drain", r6));
@@ -527152,6 +527023,189 @@ class NodeBlobStore {
   }
 }
 
+// src/renderers/experimental-trajectory-stream-renderer.ts
+var runExclusive3 = __toESM(require_runExclusive(), 1);
+
+// src/renderers/utils.ts
+async function inlineSubTask(store, message) {
+  const partsWithSubtasks = message.parts.map((part) => {
+    if (part.type === "tool-newTask" && part.state !== "input-streaming") {
+      const input = part.input;
+      const subtaskId = input._meta?.uid;
+      if (subtaskId) {
+        const subtask = store.query(defaultCatalog.queries.makeTaskQuery(subtaskId));
+        const subtaskMessages = store.query(defaultCatalog.queries.makeMessagesQuery(subtaskId));
+        if (subtask) {
+          return {
+            ...part,
+            input: {
+              ...input,
+              _transient: {
+                task: {
+                  clientTaskId: subtaskId,
+                  messages: subtaskMessages.map((m6) => m6.data),
+                  todos: subtask.todos.map((t10) => ({ ...t10 }))
+                }
+              }
+            }
+          };
+        }
+      }
+    }
+    return part;
+  });
+  return {
+    ...message,
+    parts: partsWithSubtasks
+  };
+}
+async function mapStoreBlob(store, o14) {
+  if (t3(o14) && o14.startsWith(store.protocol)) {
+    const blob3 = await store.get(o14);
+    if (!blob3)
+      throw new Error(`Store blob not found at "${o14}"`);
+    const base643 = Buffer.from(blob3.data).toString("base64");
+    return `data:${blob3.mimeType};base64,${base643}`;
+  }
+  if (o5(o14)) {
+    return Promise.all(o14.map((el) => mapStoreBlob(store, el)));
+  }
+  if (o4(o14)) {
+    const entires = await Promise.all(t4(o14).map(async ([k6, v6]) => [
+      k6,
+      await mapStoreBlob(store, v6)
+    ]));
+    return n2(entires);
+  }
+  return o14;
+}
+
+// src/renderers/experimental-trajectory-stream-renderer.ts
+class ExperimentalTrajectoryStreamRenderer {
+  stream;
+  store;
+  blobStore;
+  state;
+  emittedParts = new Map;
+  emittedMetadata = new Set;
+  unsubscribe;
+  constructor(stream29, store, blobStore, state2) {
+    this.stream = stream29;
+    this.store = store;
+    this.blobStore = blobStore;
+    this.state = state2;
+    this.unsubscribe = this.state.signal.messages.subscribe(runExclusive3.build(async (messages3) => {
+      await this.outputTrajectory(messages3);
+    }));
+  }
+  async outputTrajectory(messages3, isFinalFlush = false) {
+    for (let msgIdx = 0;msgIdx < messages3.length; msgIdx++) {
+      const message = messages3[msgIdx];
+      const isFinalized = isFinalFlush || msgIdx < messages3.length - 1;
+      const outputMessage = await inlineSubTask(this.store, message);
+      for (let i10 = 0;i10 < outputMessage.parts.length; i10++) {
+        const part = outputMessage.parts[i10];
+        const partId = `${message.id}:${i10}`;
+        const resolvedPart = await mapStoreBlob(this.blobStore, part);
+        const cachedPart = this.emittedParts.get(partId);
+        if (!k(cachedPart, resolvedPart)) {
+          const outputData = {
+            type: "message-part",
+            messageId: message.id,
+            role: message.role,
+            index: i10,
+            part: resolvedPart
+          };
+          this.stream.write(`${JSON.stringify(outputData)}
+`);
+          this.emittedParts.set(partId, p2(resolvedPart));
+        }
+      }
+      if (isFinalized && !this.emittedMetadata.has(message.id)) {
+        if (outputMessage.metadata !== undefined) {
+          const outputData = {
+            type: "message-metadata",
+            messageId: message.id,
+            role: message.role,
+            metadata: outputMessage.metadata
+          };
+          this.stream.write(`${JSON.stringify(outputData)}
+`);
+        }
+        this.emittedMetadata.add(message.id);
+      }
+    }
+  }
+  async shutdown() {
+    if (this.unsubscribe) {
+      this.unsubscribe();
+      this.unsubscribe = undefined;
+    }
+    await runExclusive3.build(async () => {
+      await this.outputTrajectory(this.state.signal.messages.value, true);
+      await this.outputFilesData();
+    })();
+  }
+  async outputFilesData() {
+    const files = this.store.query(defaultCatalog.queries.makeStoreFilesQuery());
+    if (files.length > 0) {
+      const data = {
+        type: "files",
+        files
+      };
+      this.stream.write(`${JSON.stringify(data)}
+`);
+    }
+  }
+}
+// src/renderers/json-renderer.ts
+var runExclusive4 = __toESM(require_runExclusive(), 1);
+class JsonRenderer {
+  stream;
+  store;
+  blobStore;
+  state;
+  outputMessageIds = new Set;
+  lastMessageCount = 0;
+  constructor(stream29, store, blobStore, state2) {
+    this.stream = stream29;
+    this.store = store;
+    this.blobStore = blobStore;
+    this.state = state2;
+    this.state.signal.messages.subscribe(runExclusive4.build(async (messages3) => {
+      if (messages3.length > this.lastMessageCount) {
+        await this.outputMessages(messages3.slice(0, -1));
+        this.lastMessageCount = messages3.length;
+      }
+    }));
+  }
+  async shutdown() {
+    await this.outputMessages(this.state.signal.messages.value);
+    await this.outputFilesData();
+  }
+  async outputMessages(messages3) {
+    for (const message of messages3) {
+      if (!this.outputMessageIds.has(message.id)) {
+        let outputMessage = await inlineSubTask(this.store, message);
+        outputMessage = await mapStoreBlob(this.blobStore, outputMessage);
+        this.stream.write(`${JSON.stringify(outputMessage)}
+`);
+        this.outputMessageIds.add(message.id);
+      }
+    }
+  }
+  async outputFilesData() {
+    const files = this.store.query(defaultCatalog.queries.makeStoreFilesQuery());
+    if (files.length > 0) {
+      const data = {
+        type: "files",
+        files
+      };
+      this.stream.write(`${JSON.stringify(data)}
+`);
+    }
+  }
+}
 // ../../node_modules/unist-util-find-after/lib/index.js
 var findAfter = function(parent, index3, test3) {
   const is6 = convert(test3);
@@ -537977,7 +538031,7 @@ function findTodos(message) {
   }, []);
   return todos;
 }
-// src/output-renderer.ts
+// src/renderers/output-renderer.ts
 init_source();
 
 // ../../node_modules/eventemitter3/index.mjs
@@ -539883,7 +539937,7 @@ var Listr = class {
   }
 };
 
-// src/output-renderer.ts
+// src/renderers/output-renderer.ts
 class OutputRenderer {
   stream;
   state;
@@ -540060,6 +540114,14 @@ ${optionsText}` : ""}`;
       error: errorText
     };
   }
+  if (part.type === "tool-useSkill") {
+    const { skill = "unknown" } = part.input || {};
+    return {
+      text: `\uD83E\uDDE9 Using skill ${source_default.bold(skill)}`,
+      stop: hasError ? "fail" : "succeed",
+      error: errorText
+    };
+  }
   if (part.type === "tool-todoWrite") {
     const { todos = [] } = part.input || {};
     return {
@@ -540254,7 +540316,38 @@ function renderSubtaskMessages(messages3) {
   }
   return output;
 }
-
+// src/renderers/result-renderer.ts
+class ResultRenderer {
+  stream;
+  state;
+  attemptCompletionSchemaOverride;
+  constructor(stream29, state2, options14 = {}) {
+    this.stream = stream29;
+    this.state = state2;
+    this.attemptCompletionSchemaOverride = !!options14.attemptCompletionSchemaOverride;
+  }
+  async shutdown() {
+    const messages3 = this.state.signal.messages.value;
+    const lastMessage = messages3.at(-1);
+    if (lastMessage?.role === "assistant") {
+      for (const part of lastMessage.parts || []) {
+        if (isToolUIPart(part) && part.type === "tool-attemptCompletion") {
+          if (part.input) {
+            const input = part.input;
+            if (this.attemptCompletionSchemaOverride) {
+              this.stream.write(`${JSON.stringify(input.result, null, 2)}
+`);
+            } else {
+              this.stream.write(`${input.result}
+`);
+            }
+          }
+          return;
+        }
+      }
+    }
+  }
+}
 // src/task-runner.ts
 import { spawn as spawn6 } from "node:child_process";
 
@@ -545365,6 +545458,26 @@ import {
   exec as exec9
 } from "node:child_process";
 import * as path36 from "node:path";
+class ExecuteCommandError extends Error {
+  code;
+  stdout;
+  stderr;
+  constructor({
+    message,
+    code: code4,
+    stdout: stdout5,
+    stderr: stderr7
+  }) {
+    super(message);
+    this.name = "ExecuteCommandError";
+    this.code = code4;
+    this.stdout = stdout5;
+    this.stderr = stderr7;
+  }
+  asOutput() {
+    return processCommandOutput(this.stdout, this.stderr, this.message);
+  }
+}
 var executeCommand2 = () => async ({ command, cwd: cwd3 = ".", timeout: timeout5 = 120 }, { abortSignal, cwd: workspaceDir, envs }) => {
   if (!command) {
     throw new Error("Command is required to execute.");
@@ -545376,27 +545489,20 @@ var executeCommand2 = () => async ({ command, cwd: cwd3 = ".", timeout: timeout5
     resolvedCwd = path36.normalize(path36.join(workspaceDir, cwd3));
   }
   try {
-    const {
-      code: code4,
-      stdout: stdout5 = "",
-      stderr: stderr7 = ""
-    } = await execWithExitCode(timeout5, command, {
+    const { stdout: stdout5 = "", stderr: stderr7 = "" } = await execWithExitCode(command, {
       shell: getShellPath(),
       timeout: timeout5 * 1000,
       cwd: resolvedCwd,
       signal: abortSignal,
       env: { ...process.env, ...envs, ...getTerminalEnv() }
     });
-    const { output, isTruncated } = processCommandOutput(stdout5, stderr7, code4);
-    return {
-      output,
-      isTruncated
-    };
+    return processCommandOutput(stdout5, stderr7);
   } catch (error48) {
-    if (error48 instanceof Error) {
-      if (error48.name === "AbortError") {
-        throw new Error("Command execution was aborted");
-      }
+    if (error48 instanceof ExecuteCommandError) {
+      throw error48;
+    }
+    if (error48 instanceof Error && error48.name === "AbortError") {
+      throw new Error("Command execution was aborted");
     }
     const errorMessage = error48 instanceof Error ? error48.message : String(error48);
     throw new Error(errorMessage);
@@ -545405,7 +545511,7 @@ var executeCommand2 = () => async ({ command, cwd: cwd3 = ".", timeout: timeout5
 function isExecException(error48) {
   return error48 instanceof Error && "cmd" in error48 && "killed" in error48 && "code" in error48 && "signal" in error48;
 }
-async function execWithExitCode(timeout5, command, options14) {
+async function execWithExitCode(command, options14) {
   return await new Promise((resolve25, reject3) => {
     const child = exec9(command, options14, (err3, stdout5 = "", stderr7 = "") => {
       if (!err3) {
@@ -545417,15 +545523,21 @@ async function execWithExitCode(timeout5, command, options14) {
         return;
       }
       if (isExecException(err3)) {
-        if (err3.signal === "SIGTERM" && err3.killed) {
-          reject3(new Error(`Command execution timed out after ${timeout5} seconds.`));
+        if (err3.signal === "SIGTERM" && err3.killed && options14.timeout && options14.timeout > 0) {
+          reject3(new ExecuteCommandError({
+            message: `Command execution timed out after ${options14.timeout / 1000} seconds.`,
+            stdout: err3.stdout ?? stdout5 ?? "",
+            stderr: err3.stderr ?? stderr7 ?? "",
+            code: err3.code ?? 1
+          }));
           return;
         }
-        resolve25({
-          stdout: err3.stdout || "",
-          stderr: err3.stderr || "",
-          code: err3.code || 1
-        });
+        reject3(new ExecuteCommandError({
+          message: `Command exited with code ${err3.code ?? 1}`,
+          stdout: err3.stdout ?? stdout5 ?? "",
+          stderr: err3.stderr ?? stderr7 ?? "",
+          code: err3.code ?? 1
+        }));
         return;
       }
       reject3(err3);
@@ -545433,14 +545545,17 @@ async function execWithExitCode(timeout5, command, options14) {
     child.stdin?.end();
   });
 }
-function processCommandOutput(stdout5, stderr7, code4) {
-  let fullOutput = fixExecuteCommandOutput(stdout5 + stderr7);
-  if (code4 !== 0) {
-    fullOutput += `
-Command exited with code ${code4}`;
-  }
+function processCommandOutput(stdout5, stderr7, errorMessage) {
+  const fullOutput = fixExecuteCommandOutput(stdout5 + stderr7);
   const isTruncated = fullOutput.length > MaxTerminalOutputSize;
   const output = isTruncated ? fullOutput.slice(-MaxTerminalOutputSize) : fullOutput;
+  if (errorMessage) {
+    return {
+      output,
+      isTruncated,
+      error: errorMessage
+    };
+  }
   return { output, isTruncated };
 }
 
@@ -545753,6 +545868,9 @@ async function executeToolCall(tool2, options14, cwd3, abortSignal, contentType,
         envs
       });
     } catch (e9) {
+      if (e9 instanceof ExecuteCommandError) {
+        return e9.asOutput();
+      }
       return {
         error: toErrorMessage(e9)
       };
@@ -546472,7 +546590,7 @@ var parseNonNegativeInt = (input) => {
   }
   return result2;
 };
-var program7 = new Command().name("pochi").description(`${source_default.bold("Pochi")} v${package_default.version} - A powerful CLI tool for AI-driven development.`).optionsGroup("Prompt:").option("-p, --prompt <prompt>", "Create a new task with a given prompt. Input can also be piped. For example: `cat my-prompt.md | pochi`.").option("-a, --attach <path...>", "Attach one or more files to the prompt, e.g images").optionsGroup("Options:").option("--stream-json [filepath]", "Stream the output in JSON format. This is useful for parsing the output in scripts. If filepath is not specified, the output will be written to stdout, mixed with normal UI output. Cannot be used with --output-result.").option("-x, --output-result [filepath]", "Output the result from attemptCompletion. This is useful for scripts that need to capture the final result. If filepath is not specified, the output will be written to stdout, mixed with normal UI output. Cannot be used with --stream-json.").option("--max-steps <number>", "Set the maximum number of steps for a task. The task will stop if it exceeds this limit.", parsePositiveInt, 24).option("--max-retries <number>", "Set the maximum number of retries for a single step in a task.", parsePositiveInt, 3).option("--async-wait-timeout <ms>", "Wait for async subtasks and background jobs to complete before finalizing attemptCompletion. Set to 0 to disable waiting.", parseNonNegativeInt, 60000).option("--agent <name>", "Run the task as a sub-agent using the specified custom agent. This applies the agent's system prompt and tool restrictions, matching the behavior of sub-tasks created via the newTask tool.").addOption(new Option("--experimental-output-schema <schema>", "Specify a JSON schema for the output of the task. The task will be validated against this schema.").hideHelp()).addOption(new Option("--attempt-completion-schema <schema>", "Specify a JSON schema that attempt-completion will enforce.").hideHelp()).addOption(new Option("--attempt-completion-hook <command>", "Specify a command that attempt-completion will run").hideHelp()).addOption(new Option("--ffmpeg <path>", "Specify the path to the ffmpeg executable for browser session recording. Pochi will try to use the ffmpeg executable in the system path if this option is not specified. Browser session recording is disabled when no ffmpeg executable available.").hideHelp()).addOption(new Option("--blobs-dir <path>", "Specify the path to be used as a storage directory for blobs.").default(path40.join(os16.tmpdir(), "pochi", "blobs")).hideHelp()).optionsGroup("Model:").option("-m, --model <model>", "Specify the model to be used for the task.", "google/gemini-3-flash").optionsGroup("MCP:").option("--no-mcp", "Disable MCP (Model Context Protocol) integration completely.").action(async (options14) => {
+var program7 = new Command().name("pochi").description(`${source_default.bold("Pochi")} v${package_default.version} - A powerful CLI tool for AI-driven development.`).optionsGroup("Prompt:").option("-p, --prompt <prompt>", "Create a new task with a given prompt. Input can also be piped. For example: `cat my-prompt.md | pochi`.").option("-a, --attach <path...>", "Attach one or more files to the prompt, e.g images").optionsGroup("Options:").option("--stream-json [filepath]", "Stream the output in JSON format. This is useful for parsing the output in scripts. If filepath is not specified, the output will be written to stdout, mixed with normal UI output. Cannot be used with --output-result.").option("-x, --output-result [filepath]", "Output the result from attemptCompletion. This is useful for scripts that need to capture the final result. If filepath is not specified, the output will be written to stdout, mixed with normal UI output. Cannot be used with --stream-json.").option("--experimental-stream-trajectory [filepath]", "Stream message parts whenever signal.messages updates. Cannot be used with --stream-json or --output-result.").option("--max-steps <number>", "Set the maximum number of steps for a task. The task will stop if it exceeds this limit.", parsePositiveInt, 24).option("--max-retries <number>", "Set the maximum number of retries for a single step in a task.", parsePositiveInt, 3).option("--async-wait-timeout <ms>", "Wait for async subtasks and background jobs to complete before finalizing attemptCompletion. Set to 0 to disable waiting.", parseNonNegativeInt, 60000).option("--agent <name>", "Run the task as a sub-agent using the specified custom agent. This applies the agent's system prompt and tool restrictions, matching the behavior of sub-tasks created via the newTask tool.").addOption(new Option("--experimental-output-schema <schema>", "Specify a JSON schema for the output of the task. The task will be validated against this schema.").hideHelp()).addOption(new Option("--attempt-completion-schema <schema>", "Specify a JSON schema that attempt-completion will enforce.").hideHelp()).addOption(new Option("--attempt-completion-hook <command>", "Specify a command that attempt-completion will run").hideHelp()).addOption(new Option("--ffmpeg <path>", "Specify the path to the ffmpeg executable for browser session recording. Pochi will try to use the ffmpeg executable in the system path if this option is not specified. Browser session recording is disabled when no ffmpeg executable available.").hideHelp()).addOption(new Option("--blobs-dir <path>", "Specify the path to be used as a storage directory for blobs.").default(path40.join(os16.tmpdir(), "pochi", "blobs")).hideHelp()).optionsGroup("Model:").option("-m, --model <model>", "Specify the model to be used for the task.", "google/gemini-3-flash").optionsGroup("MCP:").option("--no-mcp", "Disable MCP (Model Context Protocol) integration completely.").action(async (options14) => {
   const customAgents = await loadAgents(process.cwd());
   const skills = await loadSkills(process.cwd());
   let selectedAgent;
@@ -546515,8 +546633,8 @@ ${available2 || "  (none)"}`);
     setFfmpegPath(options14.ffmpeg);
   }
   let jsonOutputStream = undefined;
-  if (options14.streamJson && options14.outputResult) {
-    program7.error("Cannot use --stream-json and --output-result at same time.");
+  if ((options14.streamJson ? 1 : 0) + (options14.outputResult ? 1 : 0) + (options14.experimentalStreamTrajectory ? 1 : 0) > 1) {
+    program7.error("Cannot use more than one of --stream-json, --output-result, or --experimental-stream-trajectory at the same time.");
   }
   if (options14.streamJson === true) {
     jsonOutputStream = process.stdout;
@@ -546526,6 +546644,10 @@ ${available2 || "  (none)"}`);
     jsonOutputStream = process.stdout;
   } else if (typeof options14.outputResult === "string") {
     jsonOutputStream = fs21.createWriteStream(options14.outputResult);
+  } else if (options14.experimentalStreamTrajectory === true) {
+    jsonOutputStream = process.stdout;
+  } else if (typeof options14.experimentalStreamTrajectory === "string") {
+    jsonOutputStream = fs21.createWriteStream(options14.experimentalStreamTrajectory);
   }
   const mcpHub = options14.mcp ? await initializeMcp(program7) : undefined;
   const abortController = createAbortControllerWithGracefulShutdown();
@@ -546565,12 +546687,17 @@ ${available2 || "  (none)"}`);
   const outputRenderer = new OutputRenderer(process.stdout, runner.state, {
     attemptCompletionSchemaOverride: !!options14.attemptCompletionSchema
   });
-  let jsonRenderer = undefined;
+  let streamRenderer = undefined;
   if (jsonOutputStream) {
-    jsonRenderer = new JsonRenderer(jsonOutputStream, store, blobStore, runner.state, {
-      mode: options14.outputResult ? "result-only" : "full",
-      attemptCompletionSchemaOverride: !!options14.attemptCompletionSchema
-    });
+    if (options14.experimentalStreamTrajectory) {
+      streamRenderer = new ExperimentalTrajectoryStreamRenderer(jsonOutputStream, store, blobStore, runner.state);
+    } else if (options14.outputResult) {
+      streamRenderer = new ResultRenderer(jsonOutputStream, runner.state, {
+        attemptCompletionSchemaOverride: !!options14.attemptCompletionSchema
+      });
+    } else {
+      streamRenderer = new JsonRenderer(jsonOutputStream, store, blobStore, runner.state);
+    }
   }
   let runtimeError = undefined;
   try {
@@ -546579,7 +546706,7 @@ ${available2 || "  (none)"}`);
     runtimeError = error48 instanceof Error ? error48 : new Error(String(error48));
   } finally {
     outputRenderer.shutdown();
-    await jsonRenderer?.shutdown();
+    await streamRenderer?.shutdown();
     if (jsonOutputStream && jsonOutputStream instanceof fs21.WriteStream) {
       jsonOutputStream.end();
       await finished(jsonOutputStream);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpochi/cli",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "devDependencies": {
     "@commander-js/extra-typings": "^14.0.0",
     "@getpochi/common": "0.1.0-dev",