@getpochi/cli 0.5.95 → 0.5.97

package/dist/cli.js

@@ -113843,14 +113843,14 @@ var init_ShardManager = __esm(() => {
       unassignedShards.unsafeUpdate(stats.unassigned, []);
     }
     updateShardMetrics();
-    function withRetry(effect4) {
+    function withRetry2(effect4) {
       return effect4.pipe(retry2({
         schedule: spaced2(config5.persistRetryCount),
         times: config5.persistRetryCount
       }), ignore2);
     }
-    const persistRunners = unsafeMakeSemaphore2(1).withPermits(1)(withRetry(suspend3(() => storage.saveRunners(map4(state3.allRunners, ([address, runner]) => [address, runner.runner])))));
-    const persistAssignments = unsafeMakeSemaphore2(1).withPermits(1)(withRetry(suspend3(() => storage.saveAssignments(state3.assignments))));
+    const persistRunners = unsafeMakeSemaphore2(1).withPermits(1)(withRetry2(suspend3(() => storage.saveRunners(map4(state3.allRunners, ([address, runner]) => [address, runner.runner])))));
+    const persistAssignments = unsafeMakeSemaphore2(1).withPermits(1)(withRetry2(suspend3(() => storage.saveAssignments(state3.assignments))));
     const notifyUnhealthyRunner = fnUntraced2(function* (address) {
       if (!has6(state3.allRunners, address))
         return;
@@ -386409,13 +386409,11 @@ var zod_default = exports_external2;
 
 // ../tools/src/constants.ts
 var EditFileResultPrompt = `You may see the following fields in the result:
-- userEdits: If the user makes any edits, this field will contain a diff between your edit and their changes.
 - autoFormattingEdits: If the auto-formatter makes any changes, this field will contain a diff against the file content after your edits and any user edits have been applied.
 - newProblems: If any new problems are found after the edit, this field will contain information about them.
 `.trim();
 var EditFileOutputSchema = exports_external2.object({
   success: exports_external2.boolean().describe("Indicates whether the file was successfully written."),
-  userEdits: exports_external2.string().describe("The user's edits to the file, only present if the file was edited by the user.").optional(),
   autoFormattingEdits: exports_external2.string().describe("The auto-formatting edits to the file, only present if the auto formatter made changes.").optional(),
   newProblems: exports_external2.string().optional().describe("The new problems found after writing the file, if any."),
   _meta: exports_external2.object({
@@ -386513,8 +386511,9 @@ var attemptCompletionSchema = exports_external2.object({
   result: exports_external2.string().describe("The result of the task. Formulate this result in a way that is final and does not require further input from the user.")
 });
 var toolDef3 = {
-  description: `After each tool use. Once you've received the results of tool uses and can confirm that the task is complete, use this tool to present the result of your work to the user.
+  description: `Once you've received the results of tool uses and can confirm that the task is complete, use this tool to present the result of your work to the user.
 
+You MUST NOT generate any text before this tool call. All conclusion text must be included within the result parameter of the attemptCompletion tool.
 Never use this tool with a question or request to engage in further conversation! Formulate the end of your result in a way that is final and does not require further input from the user.
 `.trim(),
   inputSchema: attemptCompletionSchema,
@@ -386551,8 +386550,8 @@ Usage notes:
 - You can specify an optional timeout in seconds (up to 300s / 5 minutes). If not specified, commands will timeout after 60s (1 minute).
 - If the output exceeds 30000 characters, output will be truncated before being returned to you.
 - When issuing multiple commands:
-  - If the commands are independent and can run in parallel, make multiple executeCommand tool calls in a single message
-  - If the commands depend on each other and must run sequentially, use a single executeCommand call with '&&' to chain them together (e.g., \`git add . && git commit -m "message" && git push\`)
+  - If the commands are independent and can run in parallel, make multiple Bash tool calls in a single message. For example, if you need to run "git status" and "git diff", send a single message with two executeCommand tool calls in parallel.
+  - If the commands depend on each other and must run sequentially, use a single executeCommand call with '&&' to chain them together (e.g., \`git add . && git commit -m "message" && git push\`). For instance, if one operation must complete before another starts (like mkdir before cp, Write before executeCommand for git operations, or git add before git commit), run these operations sequentially instead.
   - Use ';' only when you need to run commands sequentially but don't care if earlier commands fail
   - DO NOT use newlines to separate commands (newlines are ok in quoted strings)
 - You shall avoid use the markdown code block syntax (backtick, '\`') in your command, as it will be interpreted as a command substitution.
@@ -386562,7 +386561,16 @@ Usage notes:
 
 Only create commits when requested by the user. If unclear, ask first. When the user asks you to create a new git commit, follow these steps carefully:
 
-1. You have the capability to call multiple tools in a single response. When multiple independent pieces of information are requested, batch your tool calls together for optimal performance. ALWAYS run the following bash commands in parallel, each using the executeCommand tool:
+Git Safety Protocol:
+- NEVER update the git config
+- NEVER run destructive/irreversible git commands (like push --force, hard reset, etc) unless the user explicitly requests them 
+- NEVER skip hooks (--no-verify, --no-gpg-sign, etc) unless the user explicitly requests it
+- NEVER run force push to main/master, warn the user if they request it
+- Avoid git commit --amend.  ONLY use --amend when either (1) user explicitly requested amend OR (2) adding edits from pre-commit hook (additional instructions below) 
+- Before amending: ALWAYS check authorship (git log -1 --format='%an %ae')
+- NEVER commit changes unless the user explicitly asks you to. It is VERY IMPORTANT to only commit when explicitly asked, otherwise the user will feel that you are being too proactive.
+
+1. You can call multiple tools in a single response. When multiple independent pieces of information are requested and all commands are likely to succeed, run multiple tool calls in parallel for optimal performance. run the following bash commands in parallel, each using the executeCommand tool:
   - Run a git status command to see all untracked files.
   - Run a git diff command to see both staged and unstaged changes that will be committed.
   - Run a git log command to see recent commit messages, so that you can follow this repository's commit message style.
@@ -386571,13 +386579,14 @@ Only create commits when requested by the user. If unclear, ask first. When the
   - Check for any sensitive information that shouldn't be committed
   - Draft a concise (1-2 sentences) commit message that focuses on the "why" rather than the "what"
   - Ensure it accurately reflects the changes and their purpose
-3. You have the capability to call multiple tools in a single response. When multiple independent pieces of information are requested, batch your tool calls together for optimal performance. ALWAYS run the following commands in parallel:
+3. You can call multiple tools in a single response. When multiple independent pieces of information are requested and all commands are likely to succeed, run multiple tool calls in parallel for optimal performance. run the following commands:
    - Add relevant untracked files to the staging area.
    - Create the commit with a message ending with:
    \uD83E\uDD16 Generated with [Pochi](https://getpochi.com)
 
    Co-Authored-By: Pochi <noreply@getpochi.com>
-   - Run git status to make sure the commit succeeded.
+   - Run git status after the commit completes to verify success.
+   Note: git status depends on the commit completing, so run it sequentially after the commit.
 4. If the commit fails due to pre-commit hook changes, retry the commit ONCE to include these automated changes. If it fails again, it usually means a pre-commit hook is preventing the commit. If the commit succeeds but you notice that files were modified by the pre-commit hook, you MUST amend your commit to include them.
 
 Important notes:
@@ -386603,13 +386612,13 @@ Use the gh command via the executeCommand tool for ALL GitHub-related tasks incl
 
 IMPORTANT: When the user asks you to create a pull request, follow these steps carefully:
 
-1. You have the capability to call multiple tools in a single response. When multiple independent pieces of information are requested, batch your tool calls together for optimal performance. ALWAYS run the following bash commands in parallel using the executeCommand tool, in order to understand the current state of the branch since it diverged from the main branch:
+1. You can call multiple tools in a single response. When multiple independent pieces of information are requested and all commands are likely to succeed, run multiple tool calls in parallel for optimal performance. run the following bash commands in parallel using the executeCommand tool, in order to understand the current state of the branch since it diverged from the main branch:
    - Run a git status command to see all untracked files
    - Run a git diff command to see both staged and unstaged changes that will be committed
    - Check if the current branch tracks a remote branch and is up to date with the remote, so you know if you need to push to the remote
    - Run a git log command and \`git diff [base-branch]...HEAD\` to understand the full commit history for the current branch (from the time it diverged from the base branch)
 2. Analyze all changes that will be included in the pull request, making sure to look at all relevant commits (NOT just the latest commit, but ALL commits that will be included in the pull request!!!), and draft a pull request summary
-3. You have the capability to call multiple tools in a single response. When multiple independent pieces of information are requested, batch your tool calls together for optimal performance. ALWAYS run the following commands in parallel:
+3. You can call multiple tools in a single response. When multiple independent pieces of information are requested and all commands are likely to succeed, run multiple tool calls in parallel for optimal performance. run the following commands in parallel:
    - Create new branch if needed
    - Push to remote with -u flag if needed
    - Create PR using gh pr create with the format below. Use a HEREDOC to pass the body to ensure correct formatting.
@@ -386675,60 +386684,6 @@ var toolDef6 = {
 };
 var listFiles = tool(toolDef6);
 
-// ../tools/src/multi-apply-diff.ts
-var toolDef7 = {
-  description: `
-This is a tool for making multiple edits to a single file in one operation. It is built on top of the applyDiff tool and allows you to perform multiple find-and-replace operations efficiently. Prefer this tool over the applyDiff tool when you need to make multiple edits to the same file.
-
-Before using this tool, use the readFile tool to understand the file's contents and context
-
-To make multiple file edits, provide the following:
-1. path: The path to the file to modify (relative to the current working directory, or an absolute path)
-2. edits: An array of edit operations to perform, where each edit contains:
-   - searchContent: The text to replace (must match the file contents exactly, including all whitespace and indentation)
-   - replaceContent : The edited text to replace the old_string
-   - expectedReplacements: The number of replacements you expect to make. Defaults to 1 if not specified.
-
-IMPORTANT:
-- All edits are applied in sequence, in the order they are provided
-- Each edit operates on the result of the previous edit
-- All edits must be valid for the operation to succeed - if any edit fails, none will be applied
-- This tool is ideal when you need to make several changes to different parts of the same file
-
-CRITICAL REQUIREMENTS:
-1. All edits follow the same requirements as the single applyDiff tool
-2. The edits are atomic - either all succeed or none are applied
-3. Plan your edits carefully to avoid conflicts between sequential operations
-
-WARNING:
-- The tool will fail if edits.searchContent matches multiple locations and edits.expectedReplacements isn't specified
-- The tool will fail if the number of matches doesn't equal edits.expectedReplacements when it's specified
-- The tool will fail if edits.searchContent doesn't match the file contents exactly (including whitespace)
-- The tool will fail if edits.searchContent and edits.replaceContent are the same
-- Since edits are applied in sequence, ensure that earlier edits don't affect the text that later edits are trying to find
-
-When making edits:
-- Ensure all edits result in idiomatic, correct code
-- Do not leave the code in a broken state
-
-If you want to create a new file, use:
-- A new file path, including dir name if needed
-- First edit: empty old_string and the new file's contents as new_string
-- Subsequent edits: normal edit operations on the created content
-
-${EditFileResultPrompt}`.trim(),
-  inputSchema: exports_external2.object({
-    path: exports_external2.string().describe("The path of the file to modify (relative to the current working directory, or an absolute path)."),
-    edits: exports_external2.array(exports_external2.object({
-      searchContent: exports_external2.string().describe("The text to replace."),
-      replaceContent: exports_external2.string().describe("The text to replace it with."),
-      expectedReplacements: exports_external2.number().optional().describe("The expected number of replacements to perform. Defaults to 1 if not specified.")
-    })).describe("A list of search and replace operations to apply to the file.")
-  }),
-  outputSchema: EditFileOutputSchema
-};
-var multiApplyDiff = tool(toolDef7);
-
 // ../tools/src/new-task.ts
 var CustomAgent = exports_external2.object({
   name: exports_external2.string().describe("The name of the custom agent."),
@@ -386799,7 +386754,7 @@ Usage notes:
 });
 
 // ../tools/src/search-files.ts
-var toolDef8 = {
+var toolDef7 = {
   description: `
 - Fast content search tool that works with any codebase size
 - Searches file contents using regular expressions
@@ -386825,7 +386780,7 @@ var toolDef8 = {
     isTruncated: exports_external2.boolean().describe("Whether the content is truncated due to exceeding the maximum buffer length")
   })
 };
-var searchFiles = tool(toolDef8);
+var searchFiles = tool(toolDef7);
 
 // ../tools/src/todo-write.ts
 var Todo = exports_external2.object({
@@ -386834,7 +386789,7 @@ var Todo = exports_external2.object({
   status: exports_external2.enum(["pending", "in-progress", "completed", "cancelled"]).describe("The status of the task."),
   priority: exports_external2.enum(["low", "medium", "high"]).describe("The priority of the task.")
 });
-var toolDef9 = {
+var toolDef8 = {
   description: `
 Use this tool to create and manage a structured task list for your current coding session. This helps you track progress, organize complex tasks, and demonstrate thoroughness to the user.
 It also helps the user understand the progress of the task and overall progress of their requests.
@@ -387010,7 +386965,7 @@ When in doubt, use this tool. Being proactive with task management demonstrates
     success: exports_external2.boolean().describe("Whether the todos were successfully updated.")
   })
 };
-var todoWrite = tool(toolDef9);
+var todoWrite = tool(toolDef8);
 // ../tools/src/read-file.ts
 var TextOutput = exports_external2.object({
   type: exports_external2.literal("text").optional(),
@@ -387046,7 +387001,7 @@ var editNotebook = tool({
 });
 
 // ../tools/src/kill-background-job.ts
-var toolDef10 = {
+var toolDef9 = {
   description: `- Kills a running background job by its ID
 - Takes a backgroundJobId parameter identifying the job to kill
 - Returns a success or failure status
@@ -387058,10 +387013,10 @@ var toolDef10 = {
     success: zod_default.boolean().describe("Whether the background job was successfully killed.")
   })
 };
-var killBackgroundJob = tool(toolDef10);
+var killBackgroundJob = tool(toolDef9);
 
 // ../tools/src/read-background-job-output.ts
-var toolDef11 = {
+var toolDef10 = {
   description: `- Retrieves output from a running or completed background job
 - Takes a backgroundJobId parameter identifying the job
 - Always returns only new output since the last check
@@ -387078,10 +387033,10 @@ var toolDef11 = {
     isTruncated: zod_default.boolean().optional().describe("Whether the output was truncated")
   })
 };
-var readBackgroundJobOutput = tool(toolDef11);
+var readBackgroundJobOutput = tool(toolDef10);
 
 // ../tools/src/start-background-job.ts
-var toolDef12 = {
+var toolDef11 = {
   description: `Start a background job to execute a bash command, which allows you to continue working while the job runs.
 
 Before starting the background job, please follow these steps:
@@ -387121,10 +387076,10 @@ Command execution rules:
     backgroundJobId: exports_external2.string().optional().describe("The ID of the background job")
   })
 };
-var startBackgroundJob = tool(toolDef12);
+var startBackgroundJob = tool(toolDef11);
 
 // ../tools/src/write-to-file.ts
-var toolDef13 = {
+var toolDef12 = {
   description: `
 Request to write full content to a file at the specified path.
 If the file exists, it will be overwritten with the provided content.
@@ -387137,7 +387092,7 @@ ${EditFileResultPrompt}`.trim(),
   }),
   outputSchema: EditFileOutputSchema
 };
-var writeToFile = tool(toolDef13);
+var writeToFile = tool(toolDef12);
 
 // ../tools/src/index.ts
 function isUserInputToolName(name17) {
@@ -387171,7 +387126,6 @@ var ToolsByPermission = {
   write: [
     "writeToFile",
     "applyDiff",
-    "multiApplyDiff",
     "editNotebook"
   ],
   execute: [
@@ -387189,7 +387143,6 @@ var createCliTools = (options) => ({
   executeCommand,
   globFiles,
   listFiles,
-  multiApplyDiff,
   readFile: createReadFileTool(options?.contentType),
   searchFiles,
   todoWrite,
@@ -387227,6 +387180,8 @@ var exports_constants = {};
 __export(exports_constants, {
   WorkspaceWorkflowPathSegments: () => WorkspaceWorkflowPathSegments,
   PochiTaskIdHeader: () => PochiTaskIdHeader,
+  PochiRequestUseCaseHeader: () => PochiRequestUseCaseHeader,
+  PochiClientHeader: () => PochiClientHeader,
   KnownTags: () => KnownTags,
   DefaultMaxOutputTokens: () => DefaultMaxOutputTokens,
   DefaultContextWindow: () => DefaultContextWindow,
@@ -387243,6 +387198,8 @@ var WorkspaceWorkflowPathSegments = [".pochi", "workflows"];
 var DefaultContextWindow = 1e5;
 var DefaultMaxOutputTokens = 4096;
 var PochiTaskIdHeader = "x-pochi-task-id";
+var PochiClientHeader = "x-pochi-client";
+var PochiRequestUseCaseHeader = "x-pochi-request-use-case";
 
 // ../common/src/base/prompts/compact.ts
 function createCompactPrompt() {
@@ -387292,6 +387249,11 @@ Summary:
 `;
 }
 
+// ../common/src/base/prompts/create-pr.ts
+function createPr(isDraft) {
+  return `Please use gh cli to create a ${isDraft ? "draft" : ""} pull request`;
+}
+
 // ../common/src/base/prompts/environment.ts
 function createEnvironmentPrompt(environment, user) {
   const sections = [
@@ -387575,7 +387537,6 @@ When the user directly asks about Pochi (eg 'can Pochi do...', 'does Pochi have.
 
 ${getTodoListPrompt()}
 ${getRulesPrompt()}
-${getObjectivePrompt()}
 ${customAgent ? "" : getCustomRulesPrompt(customRules)}
 ${getMcpInstructionsPrompt(mcpInstructions)}
 `.trim();
@@ -387587,48 +387548,16 @@ RULES
 
 - User messages may include <system-reminder> tags. <system-reminder> tags contain useful information and reminders. They are NOT part of the user's provided input or the tool result. You shall pay close attention to information in these tags and use it to inform you actions.
 - When the user initially gives you a task, a recursive list of all filepaths in the current working directory will be included in <system-reminder> tag. This provides an overview of the project's file structure, offering key insights into the project from directory/file names (how developers conceptualize and organize their code) and file extensions (the language used). This can also guide decision-making on which files to explore further. If you need to further explore directories such as outside the current working directory, you can use the listFiles tool. If you pass 'true' for the recursive parameter, it will list files recursively.
-- All file paths used by tools must be relative to current working directory.
-- You cannot \`cd\` into a different directory to complete a task. You are stuck operating from current working directory, so be sure to pass in the correct 'path' parameter when using tools that require a path.
-- Do not use the ~ character or $HOME to refer to the home directory.
-- When creating a new project (such as an app, website, or any software project), organize all new files within a dedicated project directory unless the user specifies otherwise. Use appropriate file paths when writing files, as the writeToFile tool will automatically create any necessary directories. Structure the project logically, adhering to best practices for the specific type of project being created. Unless otherwise specified, new projects should be easily run without additional setup, for example most projects can be built in HTML, CSS, and JavaScript - which you can open in a browser.
-- For editing files, you have access to these tools: applyDiff (for replacing lines in existing files), multiApplyDiff (for replacing multiple lines in existing files), and writeToFile (for creating new files or complete file rewrites).
-  * Prefer using writeToFile only for new files or when rewriting more than 70% of an existing file's content.
-  * STRONGLY PREFER using multiApplyDiff over applyDiff in most scenarios - it's more efficient and atomic than multiple applyDiff calls.
-  * Use multiApplyDiff when making ANY multiple changes to a file, even if they're in different sections.
-  * Use multiApplyDiff when refactoring code patterns, updating imports, or making systematic changes across a file.
-  * Use multiApplyDiff when you need to update related code elements (e.g., function signature + its calls, variable renames, etc.).
-  * Only use applyDiff for truly isolated single changes where no other modifications are needed.
-  * CRITICAL: Within a single response, you MUST NOT make multiple applyDiff calls to the same file path. If you need to make multiple edits to a single file, you MUST use multiApplyDiff instead. This is NON-NEGOTIABLE.
-- When using the writeToFile tool to modify a file, use the tool directly with the desired content. You do not need to display the content before using the tool. ALWAYS provide the COMPLETE file content in your response. This is NON-NEGOTIABLE. Partial updates or placeholders like '// rest of code unchanged' are STRICTLY FORBIDDEN. You MUST include ALL parts of the file, even if they haven't been modified. Failure to do so will result in incomplete or broken code, severely impacting the user's project.
+- All file paths used by tools must be relative to current working directory, do not use the ~ character or $HOME to refer to the home directory in file paths used by tools.
 - Be sure to consider the type of project (e.g. Python, JavaScript, web application) when determining the appropriate structure and files to include. Also consider what files may be most relevant to accomplishing the task, for example looking at a project's manifest file would help you understand the project's dependencies, which you could incorporate into any code you write.
-- When making changes to code, always consider the context in which the code is being used. Ensure that your changes are compatible with the existing codebase and that they follow the project's coding standards and best practices.
 - Do not ask for more information than necessary. Use the tools provided to accomplish the user's request efficiently and effectively. When you've completed your task, you must use the attemptCompletion tool to present the result to the user. The user may provide feedback, which you can use to make improvements and try again.
 - You are only allowed to ask the user questions using the askFollowupQuestion tool. Use this tool only when you need additional details to complete a task, and be sure to use a clear and concise question that will help you move forward with the task. However if you can use the available tools to avoid having to ask the user questions, you should do so. For example, if the user mentions a file that may be in an outside directory like the Desktop, you should use the listFiles tool to list the files in the Desktop and check if the file they are talking about is there, rather than asking the user to provide the file path themselves.
-- The user may provide a file's contents directly in their message, in which case you shouldn't use the readFile tool to get the file contents again since you already have it.
-- Your goal is to try to accomplish the user's task, NOT engage in a back and forth conversation.
 - You are STRICTLY FORBIDDEN from starting your messages with "Great", "Certainly", "Okay", "Sure". You should NOT be conversational in your responses, but rather direct and to the point. For example you should NOT say "Great, I've updated the CSS" but instead something like "I've updated the CSS". It is important you be clear and technical in your messages.
-- When presented with images, utilize your vision capabilities to thoroughly examine them and extract meaningful information. Incorporate these insights into your thought process as you accomplish the user's task.
-- IMPORTANT: When userEdits is present in any file editing tool call's response, UNLESS user explicitly asks, you are FORBIDDEN to make any further edits to the file, consider the file as FINAL. use askFollowupQuestion tool if you need clarifying anything.
-- NEVER commit changes unless the user explicitly asks you to. It is VERY IMPORTANT to only commit when explicitly asked, otherwise the user will feel that you are being too proactive.
+- Once you've completed the user's task, you MUST use the attemptCompletion tool to present the result of the task to the user. It is STRICTLY FORBIDDEN to complete the task without using this tool.
 - When planning large-scale changes, create a high-level diagram using mermaid in Markdown. This helps explain your plan and allows you to gather user feedback before implementation.
 `;
   return prompt;
 }
-function getObjectivePrompt() {
-  const prompt = `====
-
-OBJECTIVE
-
-You accomplish a given task iteratively, breaking it down into clear steps and working through them methodically.
-
-1. Analyze the user's task and set clear, achievable goals to accomplish it. Prioritize these goals in a logical order.
-2. Work through these goals sequentially, utilizing available tools one at a time as necessary. Each goal should correspond to a distinct step in your problem-solving process. You will be informed on the work completed and what's remaining as you go.
-3. Remember, you have extensive capabilities with access to a wide range of tools that can be used in powerful and clever ways as necessary to accomplish each goal. Before calling a tool, do some analysis: First, analyze the file structure provided in system-reminder to gain context and insights for proceeding effectively. Then, think about which of the provided tools is the most relevant tool to accomplish the user's task. Next, go through each of the required parameters of the relevant tool and determine if the user has directly provided or given enough information to infer a value. When deciding if the parameter can be inferred, carefully consider all the context to see if it supports a specific value. If all of the required parameters are present or can be reasonably inferred, proceed with the tool use. BUT, if one of the values for a required parameter is missing, DO NOT invoke the tool (not even with fillers for the missing params) and instead, ask the user to provide the missing parameters using the askFollowupQuestion tool. DO NOT ask for more information on optional parameters if it is not provided.
-4. Once you've completed the user's task, you must use the attemptCompletion tool to present the result of the task to the user. You may also provide a CLI command to showcase the result of your task; this can be particularly useful for web development tasks, where you can run e.g. \`open index.html\` to show the website you've built.
-5. The user may provide feedback, which you can use to make improvements and try again. But DO NOT continue in pointless back and forth conversations, i.e. don't end your responses with questions or offers for further assistance.
-`;
-  return prompt;
-}
 function getTodoListPrompt() {
   const prompt = `====
 
@@ -387673,6 +387602,17 @@ ${mcpInstructions}
   return prompt;
 }
 
+// ../common/src/base/prompts/workflow.ts
+function createWorkflowPrompt(id, path2, content) {
+  let processedContent = content.replace(/\n+/g, `
+`);
+  const workflowTagRegex = /<\/?workflow\b[^>]*>/g;
+  processedContent = processedContent.replace(workflowTagRegex, (match2) => {
+    return match2.replace("<", "&lt;");
+  });
+  return `<workflow id="${id}" path="${path2}">${processedContent}</workflow>`;
+}
+
 // ../common/src/base/prompts/index.ts
 var prompts = {
   system: createSystemPrompt,
@@ -387688,7 +387628,8 @@ var prompts = {
   generateTitle,
   workflow: createWorkflowPrompt,
   customAgent: createCustomAgentPrompt,
-  injectBashOutputs
+  injectBashOutputs,
+  createPr
 };
 function createSystemReminder(content) {
   return `<system-reminder>${content}</system-reminder>`;
@@ -387717,15 +387658,6 @@ function parseInlineCompact(text2) {
     summary: match2[1]
   };
 }
-function createWorkflowPrompt(id, path2, content) {
-  let processedContent = content.replace(/\n+/g, `
-`);
-  const workflowTagRegex = /<\/?workflow\b[^>]*>/g;
-  processedContent = processedContent.replace(workflowTagRegex, (match2) => {
-    return match2.replace("<", "&lt;");
-  });
-  return `<workflow id="${id}" path="${path2}">${processedContent}</workflow>`;
-}
 function createCustomAgentPrompt(id, path2) {
   let processedAgentName = id.replace(/\n+/g, `
 `);
@@ -388010,6 +387942,34 @@ function toErrorMessage(error40) {
   }
   return JSON.stringify(error40);
 }
+
+// ../common/src/base/index.ts
+var PochiProviderOptions = exports_external.object({
+  taskId: exports_external.string(),
+  client: exports_external.string(),
+  useCase: exports_external.union([
+    exports_external.literal("agent"),
+    exports_external.literal("output-schema"),
+    exports_external.literal("repair-tool-call"),
+    exports_external.literal("generate-task-title"),
+    exports_external.literal("compact-task")
+  ])
+});
+// ../common/src/vscode-webui-bridge/types/git.ts
+var GitWorktreeInfo = v4_default.object({
+  nextDisplayId: v4_default.number().min(1),
+  github: v4_default.object({
+    pullRequest: v4_default.object({
+      id: v4_default.number().describe("the ID of the pull request"),
+      status: v4_default.enum(["open", "closed", "merged"]),
+      checks: v4_default.array(v4_default.object({
+        name: v4_default.string().describe("the name of the check"),
+        state: v4_default.string().describe("the state of the check"),
+        url: v4_default.string().describe("the URL of the check")
+      })).optional()
+    }).optional()
+  })
+});
 // ../common/src/vscode-webui-bridge/types/custom-agent.ts
 var isValidCustomAgentFile = (agent) => {
   return agent.name !== undefined && agent.description !== undefined && agent.systemPrompt !== undefined && !agent.error;
@@ -391648,8 +391608,23 @@ var makeWebSearch = (getToken) => ({
   description: `
 - Allows Pochi to search the web and use the results to inform responses
 - Provides up-to-date information for current events and recent data
-- Returns search result information formatted as search result blocks
+- Returns search result information formatted as search result blocks, including links as markdown hyperlinks
 - Searches are performed automatically within a single API call
+
+CRITICAL REQUIREMENT - You MUST follow this:
+  - After answering the user's question, you MUST include a "Sources:" section at the end of your response
+  - In the Sources section, list all relevant URLs from the search results as markdown hyperlinks: [Title](URL)
+  - This is MANDATORY - never skip including sources in your response
+  - Example format:
+
+    [Your answer here]
+
+    Sources:
+    - [Source Title 1](https://example.com/1)
+    - [Source Title 2](https://example.com/2)
+
+Usage notes:
+  - Account for "Today's date" in <system-reminder>. For example, if <system-reminder> says "Today's date: 2025-07-01", and the user wants the latest docs, do not use 2024 in the search query. Use 2025.
 `.trim(),
   inputSchema: {
     jsonSchema: v4_default.toJSONSchema(v4_default.object({
@@ -391690,6 +391665,28 @@ var VendorId = "pochi";
 
 // ../vendor-pochi/src/vendor.ts
 var logger3 = getLogger("PochiVendor");
+async function withRetry(fn, options = {}) {
+  const {
+    maxRetries = 3,
+    initialDelay = 1000,
+    maxDelay = 1e4,
+    delayMultiplier = 2
+  } = options;
+  let lastError;
+  let delay2 = initialDelay;
+  for (let attempt = 0;attempt <= maxRetries; attempt++) {
+    try {
+      return await fn();
+    } catch (error40) {
+      lastError = error40 instanceof Error ? error40 : new Error(String(error40));
+      if (attempt < maxRetries) {
+        await new Promise((resolve2) => setTimeout(resolve2, delay2));
+        delay2 = Math.min(delay2 * delayMultiplier, maxDelay);
+      }
+    }
+  }
+  throw lastError;
+}
 
 class Pochi extends VendorBase {
   cachedModels;
@@ -391702,7 +391699,14 @@ class Pochi extends VendorBase {
   async fetchModels() {
     if (!this.cachedModels) {
       const apiClient = hc(getServerBaseUrl());
-      const data = await apiClient.api.models.$get().then((x) => x.json()).catch(() => {
+      const data = await withRetry(async () => {
+        const response = await apiClient.api.models.$get();
+        return response.json();
+      }, {
+        maxRetries: 3,
+        initialDelay: 1000
+      }).catch((error40) => {
+        logger3.error(`Failed to fetch models: ${error40.message}`);
         return [];
       });
       this.cachedModels = Object.fromEntries(data.map((x) => [
@@ -393124,7 +393128,19 @@ function createPochiModel({
     provider: "pochi",
     modelId: modelId || "<default>",
     supportedUrls: {},
-    doGenerate: async ({ headers, abortSignal, prompt, ...options }) => {
+    doGenerate: async ({
+      abortSignal,
+      prompt,
+      providerOptions,
+      ...options
+    }) => {
+      const headers = {};
+      const parsedOptions = PochiProviderOptions.safeParse(providerOptions?.pochi);
+      if (parsedOptions.success) {
+        headers[exports_constants.PochiTaskIdHeader] = parsedOptions.data.taskId;
+        headers[exports_constants.PochiClientHeader] = parsedOptions.data.client;
+        headers[exports_constants.PochiRequestUseCaseHeader] = parsedOptions.data.useCase;
+      }
       const apiClient = createApiClient(getCredentials);
       const resp = await apiClient.api.chat.$post({
         json: {
@@ -393135,7 +393151,7 @@ function createPochiModel({
           }
         }
       }, {
-        headers: headers ? i5(headers, (x) => x || "") : undefined,
+        headers,
         init: {
           signal: abortSignal
         }
@@ -393148,9 +393164,16 @@ function createPochiModel({
       abortSignal,
       stopSequences,
       tools,
-      headers
+      providerOptions
     }) => {
       const apiClient = createApiClient(getCredentials);
+      const headers = {};
+      const parsedOptions = PochiProviderOptions.safeParse(providerOptions?.pochi);
+      if (parsedOptions.success) {
+        headers[exports_constants.PochiTaskIdHeader] = parsedOptions.data.taskId;
+        headers[exports_constants.PochiClientHeader] = parsedOptions.data.client;
+        headers[exports_constants.PochiRequestUseCaseHeader] = parsedOptions.data.useCase;
+      }
       const data = {
         model: modelId,
         callOptions: {
@@ -393162,7 +393185,7 @@ function createPochiModel({
       const resp = await apiClient.api.chat.stream.$post({
         json: data
       }, {
-        headers: headers ? i5(headers, (x) => x || "") : undefined,
+        headers,
         init: {
           signal: abortSignal
         }
@@ -393172,8 +393195,15 @@ function createPochiModel({
         resp.headers.forEach((value2, key) => {
           responseHeaders[key] = value2;
         });
+        let message = `Failed to fetch: ${resp.status} ${resp.statusText}`;
+        if (resp.status >= 400 && resp.status < 600 && responseHeaders["content-type"]?.includes("text/plain")) {
+          const errorMessage = await resp.text();
+          if (errorMessage) {
+            message = errorMessage;
+          }
+        }
         throw new APICallError({
-          message: `Failed to fetch: ${resp.status} ${resp.statusText}`,
+          message,
           statusCode: resp.status,
           url: apiClient.api.chat.stream.$url().toString(),
           requestBodyValues: data,
@@ -403592,7 +403622,7 @@ function createPatchedFetch3(getCredentials) {
 registerModel(VendorId7, createQwenModel);
 
 // src/cli.ts
-import fs19 from "fs/promises";
+import fs18 from "fs/promises";
 import path28 from "path";
 
 // ../../node_modules/@commander-js/extra-typings/esm.mjs
@@ -405368,6 +405398,12 @@ var Todo2 = exports_Schema2.Struct({
   priority: exports_Schema2.Literal("low", "medium", "high")
 });
 var Todos = exports_Schema2.Array(Todo2);
+var ToolCall = exports_Schema2.Unknown;
+var ToolCalls = exports_Schema2.Array(ToolCall);
+var LineChanges = exports_Schema2.Struct({
+  added: exports_Schema2.Number,
+  removed: exports_Schema2.Number
+});
 var TaskStatus = exports_Schema2.Literal("completed", "pending-input", "failed", "pending-tool", "pending-model");
 var TaskError = exports_Schema2.Union(exports_Schema2.Struct({
   kind: exports_Schema2.Literal("InternalError"),
@@ -405403,9 +405439,13 @@ var taskFullFields = {
   title: exports_Schema2.optional(exports_Schema2.String),
   status: TaskStatus,
   todos: Todos,
+  pendingToolCalls: exports_Schema2.optional(ToolCalls),
   totalTokens: exports_Schema2.optional(exports_Schema2.Number),
+  lineChanges: exports_Schema2.optional(LineChanges),
+  lastStepDuration: exports_Schema2.optional(exports_Schema2.DurationFromMillis),
   error: exports_Schema2.optional(TaskError),
-  updatedAt: exports_Schema2.Date
+  updatedAt: exports_Schema2.Date,
+  displayId: exports_Schema2.optional(exports_Schema2.Number)
 };
 
 // ../livekit/src/livestore/default-schema.ts
@@ -405431,11 +405471,24 @@ var tables = {
         nullable: true,
         schema: Git
       }),
+      pendingToolCalls: exports_mod4.SQLite.json({
+        nullable: true,
+        schema: ToolCalls
+      }),
+      lineChanges: exports_mod4.SQLite.json({
+        nullable: true,
+        schema: LineChanges
+      }),
       totalTokens: exports_mod4.SQLite.integer({ nullable: true }),
+      lastStepDuration: exports_mod4.SQLite.integer({
+        nullable: true,
+        schema: exports_Schema2.DurationFromMillis
+      }),
       error: exports_mod4.SQLite.json({ schema: TaskError, nullable: true }),
       createdAt: exports_mod4.SQLite.integer({ schema: exports_Schema2.DateFromNumber }),
       updatedAt: exports_mod4.SQLite.integer({ schema: exports_Schema2.DateFromNumber }),
-      modelId: exports_mod4.SQLite.text({ nullable: true })
+      modelId: exports_mod4.SQLite.text({ nullable: true }),
+      displayId: exports_mod4.SQLite.integer({ nullable: true })
     },
     indexes: [
       {
@@ -405482,6 +405535,7 @@ var events = {
     name: "v1.TaskInited",
     schema: exports_Schema2.Struct({
       ...taskInitFields,
+      initMessages: exports_Schema2.optional(exports_Schema2.Array(DBMessage)),
       initMessage: exports_Schema2.optional(exports_Schema2.Struct({
         id: exports_Schema2.String,
         parts: exports_Schema2.Array(DBUIPart)
@@ -405505,7 +405559,8 @@ var events = {
       title: exports_Schema2.optional(exports_Schema2.String),
       git: exports_Schema2.optional(Git),
       updatedAt: exports_Schema2.Date,
-      modelId: exports_Schema2.optional(exports_Schema2.String)
+      modelId: exports_Schema2.optional(exports_Schema2.String),
+      displayId: exports_Schema2.optional(exports_Schema2.Number)
     })
   }),
   chatStreamFinished: exports_events.synced({
@@ -405515,7 +405570,8 @@ var events = {
       data: DBMessage,
       totalTokens: exports_Schema2.NullOr(exports_Schema2.Number),
       status: TaskStatus,
-      updatedAt: exports_Schema2.Date
+      updatedAt: exports_Schema2.Date,
+      duration: exports_Schema2.optional(exports_Schema2.DurationFromMillis)
     })
   }),
   chatStreamFailed: exports_events.synced({
@@ -405524,7 +405580,8 @@ var events = {
       id: exports_Schema2.String,
       error: TaskError,
       data: exports_Schema2.NullOr(DBMessage),
-      updatedAt: exports_Schema2.Date
+      updatedAt: exports_Schema2.Date,
+      duration: exports_Schema2.optional(exports_Schema2.DurationFromMillis)
     })
   }),
   updateShareId: exports_events.synced({
@@ -405559,19 +405616,40 @@ var events = {
       mimeType: exports_Schema2.String,
       data: exports_Schema2.Uint8Array
     })
+  }),
+  updateLineChanges: exports_events.synced({
+    name: "v1.updateLineChanges",
+    schema: exports_Schema2.Struct({
+      id: exports_Schema2.String,
+      lineChanges: LineChanges,
+      updatedAt: exports_Schema2.Date
+    })
   })
 };
 var materializers2 = exports_mod4.SQLite.materializers(events, {
-  "v1.TaskInited": ({ id: id4, parentId, createdAt, cwd, initMessage }) => [
+  "v1.TaskInited": ({
+    id: id4,
+    parentId,
+    createdAt,
+    cwd,
+    initMessage,
+    initMessages
+  }) => [
     tables.tasks.insert({
       id: id4,
-      status: initMessage ? "pending-model" : "pending-input",
+      status: initMessages ? initMessages.length > 0 ? "pending-model" : "pending-input" : initMessage ? "pending-model" : "pending-input",
       parentId,
       createdAt,
       cwd,
       updatedAt: createdAt
     }),
-    ...initMessage ? [
+    ...initMessages?.map((message) => {
+      return tables.messages.insert({
+        id: message.id,
+        taskId: id4,
+        data: message
+      });
+    }) ?? (initMessage ? [
       tables.messages.insert({
         id: initMessage.id,
         taskId: id4,
@@ -405581,7 +405659,7 @@ var materializers2 = exports_mod4.SQLite.materializers(events, {
           parts: initMessage.parts
         }
       })
-    ] : []
+    ] : [])
   ],
   "v1.TaskFailed": ({ id: id4, error: error42, updatedAt }) => [
     tables.tasks.update({
@@ -405597,7 +405675,8 @@ var materializers2 = exports_mod4.SQLite.materializers(events, {
     git,
     title,
     updatedAt,
-    modelId
+    modelId,
+    displayId
   }) => [
     tables.tasks.update({
       status: "pending-model",
@@ -405605,7 +405684,8 @@ var materializers2 = exports_mod4.SQLite.materializers(events, {
       git,
       title,
       updatedAt,
-      modelId
+      modelId,
+      displayId
     }).where({ id: id4 }),
     tables.messages.insert({
       id: data.id,
@@ -405613,12 +405693,20 @@ var materializers2 = exports_mod4.SQLite.materializers(events, {
       data
     }).onConflict("id", "replace")
   ],
-  "v1.ChatStreamFinished": ({ id: id4, data, totalTokens, status: status3, updatedAt }) => [
+  "v1.ChatStreamFinished": ({
+    id: id4,
+    data,
+    totalTokens,
+    status: status3,
+    updatedAt,
+    duration: duration7
+  }) => [
     tables.tasks.update({
       totalTokens,
       status: status3,
       updatedAt,
-      error: null
+      error: null,
+      lastStepDuration: duration7 ?? undefined
     }).where({ id: id4 }),
     tables.messages.insert({
       id: data.id,
@@ -405626,11 +405714,12 @@ var materializers2 = exports_mod4.SQLite.materializers(events, {
       taskId: id4
     }).onConflict("id", "replace")
   ],
-  "v1.ChatStreamFailed": ({ id: id4, error: error42, updatedAt, data }) => [
+  "v1.ChatStreamFailed": ({ id: id4, error: error42, updatedAt, data, duration: duration7 }) => [
     tables.tasks.update({
       status: "failed",
       error: error42,
-      updatedAt
+      updatedAt,
+      lastStepDuration: duration7 ?? undefined
     }).where({ id: id4 }),
     ...data ? [
       tables.messages.insert({
@@ -405648,7 +405737,11 @@ var materializers2 = exports_mod4.SQLite.materializers(events, {
     mimeType,
     data: new Uint8Array(data),
     createdAt
-  }).onConflict("checksum", "ignore")
+  }).onConflict("checksum", "ignore"),
+  "v1.updateLineChanges": ({ id: id4, lineChanges, updatedAt }) => tables.tasks.update({
+    lineChanges,
+    updatedAt
+  }).where({ id: id4 })
 });
 var state = exports_mod4.SQLite.makeState({ tables, materializers: materializers2 });
 var schema6 = makeSchema({ events, state });
@@ -405887,7 +405980,7 @@ var {
 // package.json
 var package_default = {
   name: "@getpochi/cli",
-  version: "0.5.95",
+  version: "0.5.97",
   type: "module",
   bin: {
     pochi: "src/cli.ts"
@@ -417736,35 +417829,45 @@ async function parseAgentFile(filePath, readFileContent) {
 var WorkflowFrontmatter = v4_default.object({
   model: v4_default.string().optional()
 });
-async function parseWorkflowFrontmatter(content3) {
-  if (!content3)
-    return { model: undefined };
+async function parseWorkflow(content3) {
+  if (!content3) {
+    return { frontmatter: { model: undefined }, content: "" };
+  }
   let vfile2;
   try {
-    vfile2 = await remark().use(remarkFrontmatter, [{ type: "yaml", marker: "-" }]).use(() => (_tree, file5) => matter2(file5)).process(content3);
+    vfile2 = await remark().use(remarkFrontmatter, [{ type: "yaml", marker: "-" }]).use(() => (_tree, file5) => matter2(file5)).use(() => (tree) => {
+      if ("children" in tree && Array.isArray(tree.children)) {
+        tree.children = tree.children.filter((node3) => node3.type !== "yaml");
+      }
+    }).process(content3);
   } catch (error42) {
     return {
-      model: undefined,
+      frontmatter: { model: undefined },
+      content: content3,
       error: "parseError",
       message: toErrorMessage(error42)
     };
   }
+  const contentWithoutFrontmatter = String(vfile2);
   if (!vfile2.data.matter || Object.keys(vfile2.data.matter).length === 0) {
     return {
-      model: undefined
+      frontmatter: { model: undefined },
+      content: contentWithoutFrontmatter
     };
   }
   const parseResult = WorkflowFrontmatter.safeParse(vfile2.data.matter);
   if (!parseResult.success) {
     return {
-      model: undefined,
+      frontmatter: { model: undefined },
+      content: contentWithoutFrontmatter,
       error: "validationError",
       message: v4_default.prettifyError(parseResult.error)
     };
   }
   const frontmatterData = parseResult.data;
   return {
-    model: frontmatterData.model
+    frontmatter: { model: frontmatterData.model },
+    content: contentWithoutFrontmatter
   };
 }
 // ../common/src/tool-utils/notebook-utils.ts
@@ -419098,13 +419201,13 @@ async function readWorkflowsFromDir(dir2) {
         const id4 = fileName.replace(/\.md$/, "");
         const filePath = path11.join(dir2, fileName);
         try {
-          const content3 = await fs6.readFile(filePath, "utf-8");
-          const frontmatter2 = await parseWorkflowFrontmatter(content3);
+          const fileContent = await fs6.readFile(filePath, "utf-8");
+          const { frontmatter: frontmatter2, content: content3 } = await parseWorkflow(fileContent);
           workflows.push({
             id: id4,
             pathName: getWorkflowPath(id4),
             content: content3,
-            frontmatter: { model: frontmatter2.model }
+            frontmatter: frontmatter2
           });
         } catch (e2) {}
       }
@@ -419134,20 +419237,43 @@ class JsonRenderer {
   state;
   outputMessageIds = new Set;
   lastMessageCount = 0;
-  constructor(store, state3) {
+  mode;
+  constructor(store, state3, options4 = { mode: "full" }) {
     this.store = store;
     this.state = state3;
-    this.state.signal.messages.subscribe((messages) => {
-      if (messages.length > this.lastMessageCount) {
-        this.outputMessages(messages.slice(0, -1));
-        this.lastMessageCount = messages.length;
-      }
-    });
+    this.mode = options4.mode;
+    if (this.mode === "full") {
+      this.state.signal.messages.subscribe((messages) => {
+        if (messages.length > this.lastMessageCount) {
+          this.outputMessages(messages.slice(0, -1));
+          this.lastMessageCount = messages.length;
+        }
+      });
+    }
   }
   shutdown() {
-    this.outputMessages(this.state.signal.messages.value);
+    if (this.mode === "result-only") {
+      this.outputResult();
+    } else {
+      this.outputMessages(this.state.signal.messages.value);
+    }
   }
   renderSubTask(_task) {}
+  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 result2 = part.input.result || "";
+            console.log(result2);
+          }
+          return;
+        }
+      }
+    }
+  }
   outputMessages(messages) {
     for (const message of messages) {
       if (!this.outputMessageIds.has(message.id)) {
@@ -446737,14 +446863,6 @@ function renderToolPart(part) {
       error: errorText
     };
   }
-  if (part.type === "tool-multiApplyDiff") {
-    const { path: path26 = "unknown", edits = [] } = part.input || {};
-    return {
-      text: `\uD83D\uDD27 Applying ${edits.length} edits to ${source_default.bold(path26)}`,
-      stop: hasError ? "fail" : "succeed",
-      error: errorText
-    };
-  }
   if (part.type === "tool-listFiles") {
     const { path: path26 = ".", recursive = false } = part.input || {};
     const recursiveText = recursive ? " recursively" : "";
@@ -446903,6 +447021,9 @@ function renderSubtaskMessages(messages2) {
   return output2;
 }
 
+// ../livekit/src/chat/live-chat-kit.ts
+init_effect();
+
 // ../livekit/src/task.ts
 function toTaskStatus(message, finishReason) {
   let lastStepStart = -1;
@@ -447044,8 +447165,12 @@ async function generateTitle2(store, taskId, model2, inputMessages, abortSignal)
     }
   ];
   const resp = await generateText({
-    headers: {
-      [exports_constants.PochiTaskIdHeader]: taskId
+    providerOptions: {
+      pochi: {
+        taskId,
+        version: globalThis.POCHI_CLIENT,
+        useCase: "generate-task-title"
+      }
     },
     model: model2,
     prompt: convertToModelMessages(formatters.llm(messages2, { removeSystemReminder: true })),
@@ -447123,8 +447248,12 @@ var makeRepairToolCall = (taskId, model2) => async ({ toolCall, inputSchema: inp
   const tools = createClientTools();
   const tool2 = tools[toolCall.toolName];
   const { object: repairedArgs } = await generateObject({
-    headers: {
-      [exports_constants.PochiTaskIdHeader]: taskId
+    providerOptions: {
+      pochi: {
+        taskId,
+        version: globalThis.POCHI_CLIENT,
+        useCase: "repair-tool-call"
+      }
     },
     model: model2,
     schema: tool2.inputSchema,
@@ -447182,8 +447311,12 @@ async function createSummary(store, taskId, model2, abortSignal, inputMessages)
     }
   ];
   const resp = await generateText({
-    headers: {
-      [exports_constants.PochiTaskIdHeader]: taskId
+    providerOptions: {
+      pochi: {
+        taskId,
+        version: globalThis.POCHI_CLIENT,
+        useCase: "compact-task"
+      }
     },
     model: model2,
     prompt: convertToModelMessages(formatters.llm(messages2, {
@@ -447469,15 +447602,18 @@ function createNewTaskMiddleware(store, cwd2, parentTaskId, customAgents) {
               cwd: cwd2,
               parentId: parentTaskId,
               createdAt: new Date,
-              initMessage: {
-                id: crypto.randomUUID(),
-                parts: [
-                  {
-                    type: "text",
-                    text: args2.prompt
-                  }
-                ]
-              }
+              initMessages: [
+                {
+                  id: crypto.randomUUID(),
+                  role: "user",
+                  parts: [
+                    {
+                      type: "text",
+                      text: args2.prompt
+                    }
+                  ]
+                }
+              ]
             }));
             controller.enqueue({
               ...chunk4,
@@ -447987,8 +448123,12 @@ function createOutputSchemaMiddleware(taskId, model2, outputSchema2) {
 async function ensureOutputSchema(taskId, model2, schema8, content3) {
   try {
     const { object: object4 } = await generateObject({
-      headers: {
-        [exports_constants.PochiTaskIdHeader]: taskId
+      providerOptions: {
+        pochi: {
+          taskId,
+          version: globalThis.POCHI_CLIENT,
+          useCase: "output-schema"
+        }
       },
       model: model2,
       schema: schema8,
@@ -448376,8 +448516,12 @@ class FlexibleChatTransport {
     const preparedMessages = await prepareMessages(messages2, environment2);
     const modelMessages = await resolvePromise(convertToModelMessages(formatters.llm(preparedMessages), { tools }));
     const stream12 = streamText({
-      headers: {
-        [exports_constants.PochiTaskIdHeader]: chatId
+      providerOptions: {
+        pochi: {
+          taskId: chatId,
+          client: globalThis.POCHI_CLIENT,
+          useCase: "agent"
+        }
       },
       system: prompts.system(environment2?.info?.customRules, this.customAgent, mcpInfo?.instructions),
       messages: modelMessages,
@@ -448489,12 +448633,18 @@ var logger23 = getLogger("LiveChatKit");
 
 class LiveChatKit {
   taskId;
+  displayId;
   store;
   chat;
   transport;
-  spawn;
+  onStreamStart;
+  onStreamFinish;
+  onStreamFailed;
+  compact;
+  lastStepStartTimestamp;
   constructor({
     taskId,
+    displayId,
     abortSignal,
     store,
     chatClass,
@@ -448504,10 +448654,17 @@ class LiveChatKit {
     isCli,
     customAgent,
     outputSchema: outputSchema2,
+    onStreamStart,
+    onStreamFinish,
+    onStreamFailed,
     ...chatInit
   }) {
     this.taskId = taskId;
+    this.displayId = displayId;
     this.store = store;
+    this.onStreamStart = onStreamStart;
+    this.onStreamFinish = onStreamFinish;
+    this.onStreamFailed = onStreamFailed;
     this.transport = new FlexibleChatTransport({
       store,
       onStart: this.onStart,
@@ -448550,55 +448707,57 @@ class LiveChatKit {
         }
       }
       if (onOverrideMessages) {
-        await onOverrideMessages({ messages: messages2, abortSignal: abortSignal2 });
+        await onOverrideMessages({
+          store: this.store,
+          taskId: this.taskId,
+          messages: messages2,
+          abortSignal: abortSignal2
+        });
       }
     };
-    this.spawn = async () => {
-      const taskId2 = crypto.randomUUID();
+    this.compact = async () => {
       const { messages: messages2 } = this.chat;
       const model2 = createModel2({ llm: getters.getLLM() });
       const summary6 = await compactTask({
         store: this.store,
-        taskId: taskId2,
+        taskId: this.taskId,
         model: model2,
-        messages: messages2,
-        abortSignal
+        messages: messages2
       });
       if (!summary6) {
         throw new Error("Failed to compact task");
       }
-      this.store.commit(events.taskInited({
-        id: taskId2,
-        cwd: this.task?.cwd || undefined,
-        modelId: this.task?.modelId || undefined,
-        createdAt: new Date,
-        initMessage: {
-          id: crypto.randomUUID(),
-          parts: [
-            {
-              type: "text",
-              text: summary6
-            },
-            {
-              type: "text",
-              text: "I've summarized the task and start a new task with the summary. Please analysis the current status, and use askFollowupQuestion with me to confirm the next steps"
-            }
-          ]
-        }
-      }));
-      return taskId2;
+      return summary6;
     };
   }
-  init(cwd2, promptOrParts) {
-    const parts2 = typeof promptOrParts === "string" ? [{ type: "text", text: promptOrParts }] : promptOrParts;
+  init(cwd2, options6) {
+    let initMessages = undefined;
+    if (options6) {
+      if ("messages" in options6 && options6.messages) {
+        initMessages = options6.messages;
+      } else if ("parts" in options6 && options6.parts) {
+        initMessages = [
+          {
+            id: crypto.randomUUID(),
+            role: "user",
+            parts: options6.parts
+          }
+        ];
+      } else if ("prompt" in options6 && options6.prompt) {
+        initMessages = [
+          {
+            id: crypto.randomUUID(),
+            role: "user",
+            parts: [{ type: "text", text: options6.prompt }]
+          }
+        ];
+      }
+    }
     this.store.commit(events.taskInited({
       id: this.taskId,
       cwd: cwd2,
       createdAt: new Date,
-      initMessage: parts2 ? {
-        id: crypto.randomUUID(),
-        parts: parts2
-      } : undefined
+      initMessages
     }));
     this.chat.messages = this.messages;
   }
@@ -448659,8 +448818,11 @@ class LiveChatKit {
         todos: environment2?.todos || [],
         git: toTaskGitInfo(environment2?.workspace.gitStatus),
         updatedAt: new Date,
-        modelId: llm.id
+        modelId: llm.id,
+        displayId: this.displayId
       }));
+      this.lastStepStartTimestamp = Date.now();
+      this.onStreamStart?.();
     }
   };
   onFinish = ({
@@ -448679,13 +448841,25 @@ class LiveChatKit {
     if (message.metadata?.kind !== "assistant") {
       return this.onError(abortError);
     }
+    const status3 = toTaskStatus(message, message.metadata?.finishReason);
     store.commit(events.chatStreamFinished({
       id: this.taskId,
-      status: toTaskStatus(message, message.metadata?.finishReason),
+      status: status3,
       data: message,
       totalTokens: message.metadata.totalTokens,
-      updatedAt: new Date
+      updatedAt: new Date,
+      duration: this.lastStepStartTimestamp ? exports_Duration.millis(Date.now() - this.lastStepStartTimestamp) : undefined
     }));
+    this.clearLastStepTimestamp();
+    this.onStreamFinish?.({
+      id: this.taskId,
+      cwd: this.task?.cwd ?? null,
+      status: status3,
+      messages: [...this.chat.messages]
+    });
+  };
+  clearLastStepTimestamp = () => {
+    this.lastStepStartTimestamp = undefined;
   };
   onError = (error46) => {
     logger23.error("onError", error46);
@@ -448694,8 +448868,15 @@ class LiveChatKit {
       id: this.taskId,
       error: toTaskError(error46),
       data: lastMessage,
-      updatedAt: new Date
+      updatedAt: new Date,
+      duration: this.lastStepStartTimestamp ? exports_Duration.millis(Date.now() - this.lastStepStartTimestamp) : undefined
     }));
+    this.clearLastStepTimestamp();
+    this.onStreamFailed?.({
+      cwd: this.task?.cwd ?? null,
+      error: error46,
+      messages: [...this.chat.messages]
+    });
   };
 }
 // src/lib/read-environment.ts
@@ -448959,13 +449140,6 @@ async function parseDiffAndApply(fileContent3, searchContent, replaceContent, ex
   }
   return result2;
 }
-async function processMultipleDiffs(fileContent3, edits) {
-  let updatedContent = fileContent3;
-  for (const edit of edits) {
-    updatedContent = await parseDiffAndApply(updatedContent, edit.searchContent, edit.replaceContent, edit.expectedReplacements);
-  }
-  return updatedContent;
-}
 var searchContentExact = (originalContent, searchContent) => {
   const normalizedOriginal = normalize6(originalContent);
   const normalizedSearch = normalize6(searchContent);
@@ -449259,19 +449433,6 @@ var listFiles3 = () => async ({ path: dirPath, recursive }, { abortSignal, cwd:
   });
 };
 
-// src/tools/multi-apply-diff.ts
-import * as fs15 from "node:fs/promises";
-var multiApplyDiff2 = () => async ({ path: path28, edits }, { cwd: cwd2 }) => {
-  const fileUri = resolvePath(path28, cwd2);
-  await ensureFileDirectoryExists(fileUri);
-  const fileBuffer = await fs15.readFile(fileUri);
-  validateTextFile(fileBuffer);
-  const fileContent3 = fileBuffer.toString();
-  const updatedContent = await processMultipleDiffs(fileContent3, edits);
-  await fs15.writeFile(fileUri, updatedContent);
-  return { success: true };
-};
-
 // src/tools/new-task.ts
 var newTask = (options6) => async ({ _meta, agentType }) => {
   const taskId = _meta?.uid || crypto.randomUUID();
@@ -449306,10 +449467,10 @@ var newTask = (options6) => async ({ _meta, agentType }) => {
 };
 
 // src/tools/read-file.ts
-import * as fs16 from "node:fs/promises";
-var readFile12 = () => async ({ path: path28, startLine, endLine }, { cwd: cwd2, contentType }) => {
+import * as fs15 from "node:fs/promises";
+var readFile11 = () => async ({ path: path28, startLine, endLine }, { cwd: cwd2, contentType }) => {
   const resolvedPath = resolvePath(path28, cwd2);
-  const fileBuffer = await fs16.readFile(resolvedPath);
+  const fileBuffer = await fs15.readFile(resolvedPath);
   const isPlainTextFile2 = isPlainText(fileBuffer);
   if (contentType && contentType.length > 0 && !isPlainTextFile2) {
     return readMediaFile(resolvedPath, fileBuffer, contentType);
@@ -449327,11 +449488,11 @@ var readFile12 = () => async ({ path: path28, startLine, endLine }, { cwd: cwd2,
 };
 
 // src/tools/search-files.ts
-import * as fs17 from "node:fs";
+import * as fs16 from "node:fs";
 var logger25 = getLogger("searchFiles");
 var searchFiles2 = (context15) => async ({ path: path28, regex: regex3, filePattern }, { abortSignal, cwd: cwd2 }) => {
   const rgPath = context15.rg;
-  if (!rgPath || !fs17.existsSync(rgPath)) {
+  if (!rgPath || !fs16.existsSync(rgPath)) {
     logger25.error("Ripgrep not found at path", rgPath);
     throw new Error(`Ripgrep not found at path: ${rgPath}`);
   }
@@ -449346,27 +449507,26 @@ var todoWrite2 = (_options) => async () => {
 };
 
 // src/tools/write-to-file.ts
-import * as fs18 from "node:fs/promises";
+import * as fs17 from "node:fs/promises";
 import * as nodePath from "node:path";
 var writeToFile2 = () => async ({ path: path28, content: content3 }, { cwd: cwd2 }) => {
   const filePath = resolvePath(path28, cwd2);
   if (!await isFileExists(filePath)) {
     const dirPath = nodePath.dirname(filePath);
-    await fs18.mkdir(dirPath, { recursive: true });
+    await fs17.mkdir(dirPath, { recursive: true });
   }
   const processedContent = fixCodeGenerationOutput(content3);
-  await fs18.writeFile(filePath, processedContent);
+  await fs17.writeFile(filePath, processedContent);
   return { success: true };
 };
 
 // src/tools/index.ts
 var ToolMap = {
-  readFile: readFile12,
+  readFile: readFile11,
   applyDiff: applyDiff2,
   editNotebook: editNotebook2,
   globFiles: globFiles3,
   listFiles: listFiles3,
-  multiApplyDiff: multiApplyDiff2,
   newTask,
   todoWrite: todoWrite2,
   writeToFile: writeToFile2,
@@ -449486,7 +449646,7 @@ class TaskRunner {
           parts: options6.parts
         });
       } else {
-        this.chatKit.init(options6.cwd, options6.parts);
+        this.chatKit.init(options6.cwd, { parts: options6.parts });
       }
     }
     this.taskId = options6.uid;
@@ -449907,6 +450067,7 @@ function registerUpgradeCommand(program5) {
 }
 // src/cli.ts
 var logger27 = getLogger("Pochi");
+globalThis.POCHI_CLIENT = `PochiCli/${package_default.version}`;
 logger27.debug(`pochi v${package_default.version}`);
 var parsePositiveInt = (input2) => {
   if (!input2) {
@@ -449918,7 +450079,7 @@ var parsePositiveInt = (input2) => {
   }
   return result2;
 };
-var program5 = 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`. Workflows can be triggered with `/workflow-name`, like `pochi -p /create-pr`.").option("-a, --attach <path...>", "Attach one or more files to the prompt, e.g images").optionsGroup("Options:").option("--stream-json", "Stream the output in JSON format. This is useful for parsing the output in scripts.").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).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()).optionsGroup("Model:").option("-m, --model <model>", "Specify the model to be used for the task.", "qwen/qwen3-coder").optionsGroup("MCP:").option("--no-mcp", "Disable MCP (Model Context Protocol) integration completely.").action(async (options6) => {
+var program5 = 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`. Workflows can be triggered with `/workflow-name`, like `pochi -p /create-pr`.").option("-a, --attach <path...>", "Attach one or more files to the prompt, e.g images").optionsGroup("Options:").option("--stream-json", "Stream the output in JSON format. This is useful for parsing the output in scripts.").option("-x, --output-result", "Output the result from attemptCompletion to stdout. This is useful for scripts that need to capture the final 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).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()).optionsGroup("Model:").option("-m, --model <model>", "Specify the model to be used for the task.", "google/gemini-2.5-flash").optionsGroup("MCP:").option("--no-mcp", "Disable MCP (Model Context Protocol) integration completely.").action(async (options6) => {
   const customAgents = await loadAgents(process.cwd());
   const workflows = await loadWorkflows(process.cwd());
   const { uid, prompt: prompt3, attachments } = await parseTaskInput(options6, program5, {
@@ -449931,7 +450092,7 @@ var program5 = new Command().name("pochi").description(`${source_default.bold("P
     for (const attachmentPath of attachments) {
       try {
         const absolutePath = path28.resolve(process.cwd(), attachmentPath);
-        const buffer4 = await fs19.readFile(absolutePath);
+        const buffer4 = await fs18.readFile(absolutePath);
         const mimeType = getMimeType(attachmentPath);
         const dataUrl = await fileToUri(store, new File([buffer4], attachmentPath, {
           type: mimeType
@@ -449995,7 +450156,11 @@ ${error46}`);
   const renderer = new OutputRenderer(runner.state);
   let jsonRenderer;
   if (options6.streamJson) {
-    jsonRenderer = new JsonRenderer(store, runner.state);
+    jsonRenderer = new JsonRenderer(store, runner.state, { mode: "full" });
+  } else if (options6.outputResult) {
+    jsonRenderer = new JsonRenderer(store, runner.state, {
+      mode: "result-only"
+    });
   }
   await runner.run();
   renderer.shutdown();