eve 0.75.1 → 0.76.0

package/dist/src/execution/tasks/model-step.js

@@ -1 +1 @@
-import{TASK_CANCEL_TOOL_NAME,TASK_WAIT_TOOL_NAME}from"#protocol/task-tools.js";import{createFrameworkUserMessage}from"#harness/messages.js";import{FINAL_REPLY_TASK_SYSTEM_BLOCK,TASKS_NOTE_LABEL,TASK_SYSTEM_BLOCK,renderModelOutputText,renderTaskResults,renderTasksNote}from"#execution/tasks/render.js";import{createTask,idleTasks,readTaskTable,takeTaskResults,workingTasks,writeTaskTable}from"#execution/tasks/table.js";import{observeToolOutput}from"#tool-stubs/execute.js";import{splitTaskIdInput}from"#execution/tasks/task-id-input.js";import{entryPointOf,isAgentTool,startsTasks}from"#execution/tasks/tool-entry-point.js";import{taskCancelTool}from"#tools/provided/task-cancel.js";import{taskWaitTool}from"#tools/provided/task-wait.js";function isTaskTool(e){return e?.frameworkAction===`task-wait`||e?.frameworkAction===`task-cancel`}function offersTasks(e){for(let t of e.values())if(startsTasks(t))return!0;return!1}function withTaskTools(e){return offersTasks(e)?new Map([...e,[TASK_WAIT_TOOL_NAME,taskWaitTool],[TASK_CANCEL_TOOL_NAME,taskCancelTool]]):e}function taskSystemMessages(e,t){return offersTasks(e)?[{content:t.finalReplyOnly?FINAL_REPLY_TASK_SYSTEM_BLOCK:TASK_SYSTEM_BLOCK,role:`system`}]:[]}function commitCallEntry(e,t){let n=entryPointOf(t.definition);switch(n){case`execute`:return{entry:{entryPoint:n},input:t.input,session:e};case`task`:return commitTask(e,t,n,t.input);case`serve`:{let{input:r,taskId:i}=splitTaskIdInput(t.input);return i===void 0?commitTask(e,t,n,r):{entry:{entryPoint:`receive`,taskId:i},input:r,session:e}}}}function commitTask(e,t,n,r){let i=createTask(readTaskTable(e.state),{callId:t.callId,kind:isAgentTool(t.definition)?`agent`:`tool`,name:t.toolName,resumable:n===`serve`,turnId:t.turnId});return{entry:{entryPoint:n,taskId:i.taskId},input:r,session:writeTaskTable(e,i.table)}}function workingTaskIds(e){return workingTasks(readTaskTable(e.state)).map(e=>e.id)}async function appendTaskContext(e){let t=[],n=await deliverTaskResults(e);n.message!==void 0&&t.push(createFrameworkUserMessage(`task.result`,n.message));let r=resolveTasksNote({messages:e.projectHistory([...e.messages,...t],n.session.state),session:n.session});return r!==void 0&&t.push(createFrameworkUserMessage(`context.state`,r)),{messages:t,session:n.session}}async function deliverTaskResults(e){let{table:t,taken:n}=takeTaskResults(readTaskTable(e.session.state));if(n.length===0)return{session:e.session};let r=[];for(let t of n)for(let n of t.results)r.push(await toResultBlock(t,n,e.tools.get(t.name)));return{message:renderTaskResults(r),session:writeTaskTable(e.session,t)}}async function toResultBlock(e,t,n){let r={taskId:e.id,tool:e.name};return t.status===`failed`?{...r,body:t.error,status:`failed`}:{...r,body:await projectOutput(e.name,t,n),status:`completed`}}async function projectOutput(e,t,n){return n?.toModelOutput===void 0?renderModelOutputText(t.output):await observeToolOutput(e,t.calls??[],async()=>renderModelOutputText(await n.toModelOutput(t.output)),()=>renderModelOutputText(t.output))}function resolveTasksNote(e){let t=readTaskTable(e.session.state),n=workingTasks(t).map(toListedTask),r=idleTasks(t).map(toListedTask),i=e.messages.findLast(isTasksNote);if(i===void 0&&n.length===0&&r.length===0)return;let a=renderTasksNote({idle:r,working:n});return i?.content===a?void 0:a}function toListedTask(e){return{id:e.id,tool:e.name}}function isTasksNote(e){return e.role===`user`&&typeof e.content==`string`&&e.content.startsWith(TASKS_NOTE_LABEL)}export{appendTaskContext,commitCallEntry,isTaskTool,offersTasks,taskSystemMessages,withTaskTools,workingTaskIds};
+import{TASK_CANCEL_TOOL_NAME,TASK_WAIT_TOOL_NAME}from"#protocol/task-tools.js";import{createFrameworkUserMessage}from"#harness/messages.js";import{FINAL_REPLY_TASK_SYSTEM_BLOCK,TASKS_NOTE_LABEL,TASK_SYSTEM_BLOCK,renderModelOutputText,renderTaskResults,renderTasksNote}from"#execution/tasks/render.js";import{createTask,idleTasks,readTaskTable,takeTaskResults,workingTasks,writeTaskTable}from"#execution/tasks/table.js";import{entryPointOf,isAgentTool}from"#execution/tasks/tool-entry-point.js";import{observeToolOutput}from"#tool-stubs/execute.js";import{splitTaskIdInput}from"#execution/tasks/task-id-input.js";import{taskCancelTool}from"#tools/provided/task-cancel.js";import{taskWaitTool}from"#tools/provided/task-wait.js";function isTaskTool(e){return e?.frameworkAction===`task-wait`||e?.frameworkAction===`task-cancel`}function isWorkflowTool(e){return e?.workflowId!==void 0||isTaskTool(e)}function withTaskTools(e){return new Map([...e,[TASK_WAIT_TOOL_NAME,taskWaitTool],[TASK_CANCEL_TOOL_NAME,taskCancelTool]])}function taskSystemMessages(e,t){return e?[{content:t.finalReplyOnly?FINAL_REPLY_TASK_SYSTEM_BLOCK:TASK_SYSTEM_BLOCK,role:`system`}]:[]}function commitCallEntry(e,t){let n=entryPointOf(t.definition);switch(n){case`execute`:return{entry:{entryPoint:n},input:t.input,session:e};case`task`:return commitTask(e,t,n,t.input);case`serve`:{let{input:r,taskId:i}=splitTaskIdInput(t.input);return i===void 0?commitTask(e,t,n,r):{entry:{entryPoint:`receive`,taskId:i},input:r,session:e}}}}function commitTask(e,t,n,r){let i=createTask(readTaskTable(e.state),{callId:t.callId,kind:isAgentTool(t.definition)?`agent`:`tool`,name:t.toolName,resumable:n===`serve`,turnId:t.turnId});return{entry:{entryPoint:n,taskId:i.taskId},input:r,session:writeTaskTable(e,i.table)}}function workingTaskIds(e){return workingTasks(readTaskTable(e.state)).map(e=>e.id)}async function appendTaskContext(e){let t=[],n=await deliverTaskResults(e);n.message!==void 0&&t.push(createFrameworkUserMessage(`task.result`,n.message));let r=resolveTasksNote({messages:e.projectHistory([...e.messages,...t],n.session.state),session:n.session});return r!==void 0&&t.push(createFrameworkUserMessage(`context.state`,r)),{messages:t,session:n.session}}async function deliverTaskResults(e){let{table:t,taken:n}=takeTaskResults(readTaskTable(e.session.state));if(n.length===0)return{session:e.session};let r=[];for(let t of n)for(let n of t.results)r.push(await toResultBlock(t,n,e.tools.get(t.name)));return{message:renderTaskResults(r),session:writeTaskTable(e.session,t)}}async function toResultBlock(e,t,n){let r={taskId:e.id,tool:e.name};return t.status===`failed`?{...r,body:t.error,status:`failed`}:{...r,body:await projectOutput(e.name,t,n),status:`completed`}}async function projectOutput(e,t,n){return n?.toModelOutput===void 0?renderModelOutputText(t.output):await observeToolOutput(e,t.calls??[],async()=>renderModelOutputText(await n.toModelOutput(t.output)),()=>renderModelOutputText(t.output))}function resolveTasksNote(e){let t=readTaskTable(e.session.state),n=workingTasks(t).map(toListedTask),r=idleTasks(t).map(toListedTask),i=e.messages.findLast(isTasksNote);if(i===void 0&&n.length===0&&r.length===0)return;let a=renderTasksNote({idle:r,working:n});return i?.content===a?void 0:a}function toListedTask(e){return{id:e.id,tool:e.name}}function isTasksNote(e){return e.role===`user`&&typeof e.content==`string`&&e.content.startsWith(TASKS_NOTE_LABEL)}export{appendTaskContext,commitCallEntry,isTaskTool,isWorkflowTool,taskSystemMessages,withTaskTools,workingTaskIds};

package/dist/src/execution/tasks/render.d.ts

@@ -1,5 +1,5 @@
 import type { TaskCancelResult, TaskWaitResult } from "#execution/tasks/calls.js";
-export declare const TASK_WAIT_DESCRIPTION = "Call task_wait sparingly, only when you deliberately want to withhold a message from the user while waiting for a task result. Tasks keep running and their results reach you without calling task_wait. If the user should hear from you now, reply instead. Wait silently until any of your tasks has a result, a new message arrives, or timeoutSeconds pass. It returns after the first result, which follows in a <task_result> message; wait again only if you still want to withhold a reply until another result arrives. Waiting never stops a task.";
+export declare const TASK_WAIT_DESCRIPTION = "Call eve__task_wait sparingly, only when you deliberately want to withhold a message from the user while waiting for a task result. Tasks keep running and their results reach you without calling eve__task_wait. If the user should hear from you now, reply instead. Wait silently until any of your tasks has a result, a new message arrives, or timeoutSeconds pass. It returns after the first result, which follows in a <task_result> message; wait again only if you still want to withhold a reply until another result arrives. Waiting never stops a task.";
 export declare const TASK_WAIT_TIMEOUT_DESCRIPTION = "Optional. Seconds to wait before returning without a result. Omit it to wait for a result or a new message, which is almost always right. Don't use short timeouts to check on tasks: results reach you without checking.";
 export declare const TASK_CANCEL_DESCRIPTION = "Stop a task's current work. That work never reports back; if it already had a result, that result is still delivered. An agent, or any task that accepts more input, stays available: call its tool with its taskId to give it new work.";
 export declare const TASK_CANCEL_TASK_ID_DESCRIPTION = "The id of the task to stop, copied from its \"Started task\" receipt or the [Tasks] note.";
@@ -29,11 +29,11 @@ export declare function renderTaskReceipt(task: {
 export declare function renderTaskSentReceipt(taskId: string): string;
 export declare function renderUnknownTaskError(taskId: string, tool: string): string;
 export declare function renderUnknownCancelTaskError(taskId: string): string;
-/** What the model reads when `task_cancel` answers. */
+/** What the model reads when `eve__task_cancel` answers. */
 export declare function renderTaskCancelResult(taskId: string, result: TaskCancelResult): string;
 export declare function renderTooManyTasksError(max: number, workingIds: readonly string[]): string;
 export declare function renderFinalOutputWhileWorkingError(workingIds: readonly string[]): string;
-/** What the model reads when `task_wait` returns after waiting `waitedMs`. */
+/** What the model reads when `eve__task_wait` returns after waiting `waitedMs`. */
 export declare function renderTaskWaitResult(result: TaskWaitResult, waitedMs: number): string;
 /** One `<task_result>` block of a `task.result` message. */
 export interface TaskResultBlock {

package/dist/src/execution/tasks/render.js

@@ -1,6 +1,6 @@
-import{formatDuration}from"#shared/format-duration.js";const TASK_WAIT_DESCRIPTION=`Call task_wait sparingly, only when you deliberately want to withhold a message from the user while waiting for a task result. Tasks keep running and their results reach you without calling task_wait. If the user should hear from you now, reply instead. Wait silently until any of your tasks has a result, a new message arrives, or timeoutSeconds pass. It returns after the first result, which follows in a <task_result> message; wait again only if you still want to withhold a reply until another result arrives. Waiting never stops a task.`,TASK_WAIT_TIMEOUT_DESCRIPTION=`Optional. Seconds to wait before returning without a result. Omit it to wait for a result or a new message, which is almost always right. Don't use short timeouts to check on tasks: results reach you without checking.`,TASK_CANCEL_DESCRIPTION=`Stop a task's current work. That work never reports back; if it already had a result, that result is still delivered. An agent, or any task that accepts more input, stays available: call its tool with its taskId to give it new work.`,TASK_ID_SOURCE=`copied from its "Started task" receipt or the [Tasks] note`,TASK_CANCEL_TASK_ID_DESCRIPTION=`The id of the task to stop, ${TASK_ID_SOURCE}.`,TASK_SYSTEM_BLOCK_OPENING=[`Tasks`,`- A call that returns "Started task <id>" is a task: it keeps working while you continue. Every agent call is a task.`,`- Each result arrives once, in a <task_result> message. Until then you know nothing about it, so don't guess or report its result.`,`- Ending your reply doesn't end your turn. While tasks work, eve holds your turn and calls you again with each result.`],TASK_SYSTEM_BLOCK_CLOSING=[`- Don't redo work you delegated. Never use sleep or shell commands to wait for a task.`,`- To correct or continue an agent, or any task that accepts more input, call its tool again with its taskId. A new message never stops your tasks: answer it if it asks you something, decide whether it changes the work, then keep each task, correct an agent by taskId, or stop a task with task_cancel.`],TASK_SYSTEM_BLOCK=[...TASK_SYSTEM_BLOCK_OPENING,`- If you have nothing to tell the person until a result arrives, call task_wait. Start every independent task first, then wait.`,`- If the person should hear from you now, for example to confirm work is underway when they don't need the result yet, reply. When results arrive, report them without repeating yourself.`,...TASK_SYSTEM_BLOCK_CLOSING].join(`
-`),FINAL_REPLY_TASK_SYSTEM_BLOCK=[...TASK_SYSTEM_BLOCK_OPENING,`- Only your final reply reaches your caller. While tasks work, call task_wait instead of replying. Start every independent task first, then wait.`,...TASK_SYSTEM_BLOCK_CLOSING].join(`
-`),SERVE_TOOL_DESCRIPTION=`To send this task more input, call this tool again with its taskId; without taskId, each call starts a new task.`,AGENT_SERVE_TOOL_DESCRIPTION=`It does not see this conversation, so put everything it needs in message. To correct or continue an agent task, call this tool again with its taskId; without taskId, each call starts a new agent.`,TASK_ID_INPUT_DESCRIPTION=`The id of a task this tool started, ${TASK_ID_SOURCE}, to send it this input. Omit it to start a new task.`,TASKS_NOTE_LABEL=`[Tasks]`,TASK_RESULT_TAG=`<task_result`,UNREADABLE_TASK_ERROR=`The task's state could not be read.`;function renderTaskReceipt(e){let t=`Started task ${e.id}. Its result will arrive in a <task_result> message.`;return e.resumable?`${t} To send it another message, call ${e.tool} again with taskId ${e.id}.`:t}function renderTaskSentReceipt(e){return`Sent to task ${e}. Its reply will arrive in a <task_result> message.`}function renderUnknownTaskError(e,t){return`No task "${e}" is available to ${t}: it may have ended or belong to another tool. Start a new one by calling ${t} without taskId.`}function renderUnknownCancelTaskError(e){return`No task "${e}" is in this session. Copy an id from a "Started task" receipt or the [Tasks] note.`}function renderTaskCancelResult(e,t){return t.status===`already_finished`?`${e} had no work to stop.`:t.resumable?`Stopped ${e}'s current work; it won't report back. To give it new work, call ${t.tool} again with taskId ${e}.`:`Stopped ${e}; it won't report back.`}function renderTooManyTasksError(e,t){return`${String(e)} tasks are already working (${t.join(`, `)}). Wait with task_wait or stop one with task_cancel, then try again.`}function renderFinalOutputWhileWorkingError(e){return`You can't give your final output while tasks you started are working (${e.join(`, `)}). Wait for their results with task_wait, or stop a task with task_cancel, then call final_output.`}function renderTaskWaitResult(e,t){switch(e.status){case`settled`:return renderSettledWait(e.settled,e.working);case`timeout`:return`Stopped waiting after ${formatDuration(t)}; ${countWorking(e.working)}. ${resultsArriveLater(e.working.length)}`;case`interrupt`:return`A new message arrived, so the wait ended after ${formatDuration(t)}; ${countWorking(e.working)}. Read the message, answer it if it asks you something, and decide whether it changes this work: ${interruptChoices(e.working.length)}`}}function renderSettledWait(e,t){if(e.length===0&&t.length===0)return`No tasks are working.`;let n=[];if(e.length>0){let t=e.map(e=>`${e.id} ${e.status}`),r=e.length===1?`its result follows`:`their results follow`;n.push(`${joinList(t)}; ${r}.`)}return t.length>0&&n.push(`${capitalize(countWorking(t))}: ${t.join(`, `)}.`),n.join(` `)}function countWorking(e){return e.length===1?`1 task is still working`:`${String(e.length)} tasks are still working`}function resultsArriveLater(e){return e===1?`Its result arrives before your turn ends; wait again only if you need it now.`:`Their results arrive before your turn ends; wait again only if you need them now.`}function interruptChoices(e){return`${e===1?`keep the task`:`keep the tasks`}, call an agent again with its taskId to correct it, or stop a task with task_cancel.`}function renderTaskResults(e){let t={bytes:51200,lines:2e3};return e.map(e=>{let n=fitToBudget(escapeTaskResultBody(e.body),t),r=`id="${escapeAttribute(e.taskId)}" tool="${escapeAttribute(e.tool)}" status="${e.status}"`;return`${TASK_RESULT_TAG} ${r}>${n}</task_result>`}).join(`
+import{TASK_CANCEL_TOOL_NAME,TASK_WAIT_TOOL_NAME}from"#protocol/task-tools.js";import{REPLY_TOOL_NAME}from"#protocol/reply-tool.js";import{formatDuration}from"#shared/format-duration.js";const TASK_WAIT_DESCRIPTION=`Call ${TASK_WAIT_TOOL_NAME} sparingly, only when you deliberately want to withhold a message from the user while waiting for a task result. Tasks keep running and their results reach you without calling ${TASK_WAIT_TOOL_NAME}. If the user should hear from you now, reply instead. Wait silently until any of your tasks has a result, a new message arrives, or timeoutSeconds pass. It returns after the first result, which follows in a <task_result> message; wait again only if you still want to withhold a reply until another result arrives. Waiting never stops a task.`,TASK_WAIT_TIMEOUT_DESCRIPTION=`Optional. Seconds to wait before returning without a result. Omit it to wait for a result or a new message, which is almost always right. Don't use short timeouts to check on tasks: results reach you without checking.`,TASK_CANCEL_DESCRIPTION=`Stop a task's current work. That work never reports back; if it already had a result, that result is still delivered. An agent, or any task that accepts more input, stays available: call its tool with its taskId to give it new work.`,TASK_ID_SOURCE=`copied from its "Started task" receipt or the [Tasks] note`,TASK_CANCEL_TASK_ID_DESCRIPTION=`The id of the task to stop, ${TASK_ID_SOURCE}.`,TASK_SYSTEM_BLOCK_OPENING=[`Tasks`,`- A call that returns "Started task <id>" is a task: it keeps working while you continue. Every agent call is a task.`,`- Each result arrives once, in a <task_result> message. Until then you know nothing about it, so don't guess or report its result.`,`- Ending your reply doesn't end your turn. While tasks work, eve holds your turn and calls you again with each result.`],TASK_SYSTEM_BLOCK_CLOSING=[`- Don't redo work you delegated. Never use sleep or shell commands to wait for a task.`,`- To correct or continue an agent, or any task that accepts more input, call its tool again with its taskId. A new message never stops your tasks: answer it if it asks you something, decide whether it changes the work, then keep each task, correct an agent by taskId, or stop a task with ${TASK_CANCEL_TOOL_NAME}.`],TASK_SYSTEM_BLOCK=[...TASK_SYSTEM_BLOCK_OPENING,`- If you have nothing to tell the person until a result arrives, call ${TASK_WAIT_TOOL_NAME}. Start every independent task first, then wait.`,`- If the person should hear from you now, for example to confirm work is underway when they don't need the result yet, reply. When results arrive, report them without repeating yourself.`,...TASK_SYSTEM_BLOCK_CLOSING].join(`
+`),FINAL_REPLY_TASK_SYSTEM_BLOCK=[...TASK_SYSTEM_BLOCK_OPENING,`- Only your final reply reaches your caller. While tasks work, call ${TASK_WAIT_TOOL_NAME} instead of replying. Start every independent task first, then wait.`,...TASK_SYSTEM_BLOCK_CLOSING].join(`
+`),SERVE_TOOL_DESCRIPTION=`To send this task more input, call this tool again with its taskId; without taskId, each call starts a new task.`,AGENT_SERVE_TOOL_DESCRIPTION=`It does not see this conversation, so put everything it needs in message. To correct or continue an agent task, call this tool again with its taskId; without taskId, each call starts a new agent.`,TASK_ID_INPUT_DESCRIPTION=`The id of a task this tool started, ${TASK_ID_SOURCE}, to send it this input. Omit it to start a new task.`,TASKS_NOTE_LABEL=`[Tasks]`,TASK_RESULT_TAG=`<task_result`,UNREADABLE_TASK_ERROR=`The task's state could not be read.`;function renderTaskReceipt(e){let t=`Started task ${e.id}. Its result will arrive in a <task_result> message.`;return e.resumable?`${t} To send it another message, call ${e.tool} again with taskId ${e.id}.`:t}function renderTaskSentReceipt(e){return`Sent to task ${e}. Its reply will arrive in a <task_result> message.`}function renderUnknownTaskError(e,t){return`No task "${e}" is available to ${t}: it may have ended or belong to another tool. Start a new one by calling ${t} without taskId.`}function renderUnknownCancelTaskError(e){return`No task "${e}" is in this session. Copy an id from a "Started task" receipt or the [Tasks] note.`}function renderTaskCancelResult(e,t){return t.status===`already_finished`?`${e} had no work to stop.`:t.resumable?`Stopped ${e}'s current work; it won't report back. To give it new work, call ${t.tool} again with taskId ${e}.`:`Stopped ${e}; it won't report back.`}function renderTooManyTasksError(e,t){return`${String(e)} tasks are already working (${t.join(`, `)}). Wait with ${TASK_WAIT_TOOL_NAME} or stop one with ${TASK_CANCEL_TOOL_NAME}, then try again.`}function renderFinalOutputWhileWorkingError(e){return`You can't give your final reply while tasks you started are working (${e.join(`, `)}). Wait for their results with ${TASK_WAIT_TOOL_NAME}, or stop a task with ${TASK_CANCEL_TOOL_NAME}, then call ${REPLY_TOOL_NAME}.`}function renderTaskWaitResult(e,t){switch(e.status){case`settled`:return renderSettledWait(e.settled,e.working);case`timeout`:return`Stopped waiting after ${formatDuration(t)}; ${countWorking(e.working)}. ${resultsArriveLater(e.working.length)}`;case`interrupt`:return`A new message arrived, so the wait ended after ${formatDuration(t)}; ${countWorking(e.working)}. Read the message, answer it if it asks you something, and decide whether it changes this work: ${interruptChoices(e.working.length)}`}}function renderSettledWait(e,t){if(e.length===0&&t.length===0)return`No tasks are working.`;let n=[];if(e.length>0){let t=e.map(e=>`${e.id} ${e.status}`),r=e.length===1?`its result follows`:`their results follow`;n.push(`${joinList(t)}; ${r}.`)}return t.length>0&&n.push(`${capitalize(countWorking(t))}: ${t.join(`, `)}.`),n.join(` `)}function countWorking(e){return e.length===1?`1 task is still working`:`${String(e.length)} tasks are still working`}function resultsArriveLater(e){return e===1?`Its result arrives before your turn ends; wait again only if you need it now.`:`Their results arrive before your turn ends; wait again only if you need them now.`}function interruptChoices(e){return`${e===1?`keep the task`:`keep the tasks`}, call an agent again with its taskId to correct it, or stop a task with ${TASK_CANCEL_TOOL_NAME}.`}function renderTaskResults(e){let t={bytes:51200,lines:2e3};return e.map(e=>{let n=fitToBudget(escapeTaskResultBody(e.body),t),r=`id="${escapeAttribute(e.taskId)}" tool="${escapeAttribute(e.tool)}" status="${e.status}"`;return`${TASK_RESULT_TAG} ${r}>${n}</task_result>`}).join(`
 `)}const TASK_RESULT_BLOCK=RegExp(`${TASK_RESULT_TAG} id="([^"]*)" tool="([^"]*)" status="(completed|failed)">([\\s\\S]*?)</task_result>`,`g`);function readTaskResults(e){return[...e.matchAll(TASK_RESULT_BLOCK)].map(([,e,t,n,r])=>({body:r.replaceAll(`<\\/task_result`,`</task_result`),status:n,taskId:e,tool:t}))}function fitToBudget(e,t){let n=new TextEncoder,r=e.split(`
 `),i=[];for(let e of r){let r=n.encode(e).byteLength+1;if(t.lines===0||r>t.bytes){i.push(`[truncated]`),t.lines=0,t.bytes=0;break}i.push(e),--t.lines,t.bytes-=r}return i.join(`
 `)}function escapeTaskResultBody(e){return e.replaceAll(`</task_result`,`<\\/task_result`)}function renderModelOutputText(e){if(typeof e==`string`)return e;if(isModelOutput(e))switch(e.type){case`text`:return String(e.value);case`json`:return JSON.stringify(e.value);case`content`:return renderContentParts(e.value)}return JSON.stringify(e??null)}function renderContentParts(e){return Array.isArray(e)?e.map(e=>e.type===`text`?String(e.text):`[file: ${typeof e.filename==`string`?e.filename:String(e.mediaType)}]`).join(`

package/dist/src/execution/tasks/session.d.ts

@@ -4,6 +4,7 @@ import { type TaskRunMessage } from "#execution/tasks/steps.js";
 import { type TaskTable } from "#execution/tasks/table.js";
 import type { WorkflowToolRunMessage } from "#execution/tools/workflow/messages.js";
 import type { TaskCancelReason } from "#protocol/message.js";
+import { TASK_CANCEL_TOOL_NAME } from "#protocol/task-tools.js";
 import type { RuntimeActionResult } from "#shared/action-types.js";
 /** Whether a run's message changes a task record. */
 export declare function isTaskRunMessage(message: WorkflowToolRunMessage): message is TaskRunMessage;
@@ -15,5 +16,5 @@ export declare function sessionTaskTable(cursor: SessionStateCursor): TaskTable;
  */
 export declare function cancelWorkingTasks(cursor: SessionStateCursor, reason: Exclude<TaskCancelReason, "task_cancel">): Promise<void>;
 export declare function answerTaskCancel(cursor: SessionStateCursor, call: Extract<TaskToolCall, {
-    readonly kind: "task_cancel";
+    readonly kind: typeof TASK_CANCEL_TOOL_NAME;
 }>): Promise<RuntimeActionResult>;

package/dist/src/execution/tasks/table.d.ts

@@ -111,7 +111,7 @@ export declare function taskWaitResult(table: TaskTable, wake: {
     readonly timedOut: boolean;
 }): TaskWaitResult | undefined;
 /**
- * What `task_cancel` answers, or `undefined` for a task that doesn't exist.
+ * What `eve__task_cancel` answers, or `undefined` for a task that doesn't exist.
  * `cancelled` means the caller cancels the working task.
  */
 export declare function taskCancelResult(table: TaskTable, taskId: string): TaskCancelResult | undefined;

package/dist/src/execution/tasks/tool-entry-point.d.ts

@@ -1,7 +1,7 @@
 import type { HarnessToolDefinition } from "#harness/execute-tool.js";
 import type { WorkflowToolEntryPoint } from "#tools/workflow-entry-point.js";
 /**
- * The entry point a deferred tool's calls run through. Every agent tool is a
+ * The entry point a workflow tool's calls run through. Every agent tool is a
  * `serve` tool; tools that dispatch nowhere are called like `execute`.
  */
 export declare function entryPointOf(definition: HarnessToolDefinition | undefined): WorkflowToolEntryPoint;

package/dist/src/execution/tool-auth.js

@@ -1 +1 @@
-import{buildBaseToolContext}from"#context/build-base-tool-context.js";import{createAuthorizationContext}from"#runtime/authorization-context.js";import{handleAuthorizationError}from"#runtime/connections/scoped-authorization.js";function createToolExecuteWithAuth(e){return(t,n)=>{let r=createAuthorizationContext({scope:e.scope}),i={...buildBaseToolContext({options:n,toolName:e.scope}),messages:n.messages,getToken:r.getToken,requireAuth:r.requireAuth};return r.run(()=>e.execute(t,i))}}function buildApprovalResponseAuth(e){let t=createAuthorizationContext({scope:e.scope,boundResponder:e.responder});return{getToken:(n,r)=>t.getToken(n,namespaceApprovalAuthOptions(e.scope,r)),requireAuth:(n,r)=>t.requireAuth(n,namespaceApprovalAuthOptions(e.scope,r))}}function namespaceApprovalAuthOptions(e,t){return t?.authKey===void 0?t:{...t,authKey:`${e}:${t.authKey}`}}async function handleApprovalResponsePolicyError(e){return await handleAuthorizationError(e)}export{buildApprovalResponseAuth,createToolExecuteWithAuth,handleApprovalResponsePolicyError};
+import{handleAuthorizationError}from"#runtime/connections/scoped-authorization.js";import{buildBaseToolContext}from"#context/build-base-tool-context.js";import{createAuthorizationContext}from"#runtime/authorization-context.js";function createToolExecuteWithAuth(e){return(t,n)=>{let r=createAuthorizationContext({scope:e.scope}),i={...buildBaseToolContext({options:n,toolName:e.scope}),messages:n.messages,getToken:r.getToken,requireAuth:r.requireAuth};return r.run(()=>e.execute(t,i))}}function buildApprovalResponseAuth(e){let t=createAuthorizationContext({scope:e.scope,boundResponder:e.responder});return{getToken:(n,r)=>t.getToken(n,namespaceApprovalAuthOptions(e.scope,r)),requireAuth:(n,r)=>t.requireAuth(n,namespaceApprovalAuthOptions(e.scope,r))}}function namespaceApprovalAuthOptions(e,t){return t?.authKey===void 0?t:{...t,authKey:`${e}:${t.authKey}`}}async function handleApprovalResponsePolicyError(e){return await handleAuthorizationError(e)}export{buildApprovalResponseAuth,createToolExecuteWithAuth,handleApprovalResponsePolicyError};

package/dist/src/execution/tools/agent-router-workflow.js

@@ -1 +1 @@
-import{decide}from"#ai/decide.js";async function runAgentRouterTask(e,t){"use workflow";let n=await chooseTarget(e.message,descriptions(t),t.abortSignal),{message:r,status:i}=await(await t.agent(n).send(e.message,{signal:t.abortSignal})).result();if(i===`failed`)throw Error(`Agent "${n}" failed to handle the task.`);return r??null}async function chooseTarget(e,t,n){"use step";let r=Object.keys(t);if(r.length===0)throw Error(`agentRouter requires at least one available agent with a description.`);return r.length===1?r[0]:(await decide({abortSignal:n,state:{message:e},questions:{route:{type:`choice`,instructions:`Which subagent should handle this task?`,criteria:t}}})).answers.route.choice}function descriptions(e){return Object.fromEntries(Object.entries(e.agents).flatMap(([e,t])=>{let n=t.description.trim();return n.length===0?[]:[[e,n]]}))}runAgentRouterTask.workflowId=`workflow//eve@0.75.1//runAgentRouterTask`;export{runAgentRouterTask};
+import{decide}from"#ai/decide.js";async function runAgentRouterTask(e,t){"use workflow";let n=await chooseTarget(e.message,descriptions(t),t.abortSignal),{message:r,status:i}=await(await t.agent(n).send(e.message,{signal:t.abortSignal})).result();if(i===`failed`)throw Error(`Agent "${n}" failed to handle the task.`);return r??null}async function chooseTarget(e,t,n){"use step";let r=Object.keys(t);if(r.length===0)throw Error(`agentRouter requires at least one available agent with a description.`);return r.length===1?r[0]:(await decide({abortSignal:n,state:{message:e},questions:{route:{type:`choice`,instructions:`Which subagent should handle this task?`,criteria:t}}})).answers.route.choice}function descriptions(e){return Object.fromEntries(Object.entries(e.agents).flatMap(([e,t])=>{let n=t.description.trim();return n.length===0?[]:[[e,n]]}))}runAgentRouterTask.workflowId=`workflow//eve@0.76.0//runAgentRouterTask`;export{runAgentRouterTask};

package/dist/src/execution/tools/workflow/harness-definition.js

@@ -1 +1 @@
-import{UNSPECIFIED_INPUT_SCHEMA,toInputSchema,toOutputSchema}from"#tools/schema.js";import{workflowIdForHandling}from"#runtime/subagents/workflow-reference.js";import{withTaskIdInput}from"#execution/tasks/task-id-input.js";import{entryPointOf}from"#execution/tasks/tool-entry-point.js";function createWorkflowToolHarnessDefinition(e){return{...entryPointOf(e.definition)===`serve`?withTaskIdInput(e.definition):e.definition,execute:void 0,executeInput:e.executeInput,workflowId:e.workflowId}}function createPreparedWorkflowToolHarnessDefinition(e){let t=workflowIdForHandling(e.behavior?.handling);if(t===void 0)throw Error(`Prepared tool "${e.name}" is not backed by a workflow.`);return createWorkflowToolHarnessDefinition({definition:{frameworkTool:e.kind!==`authored-tool`||e.owner.kind===`framework`,behavior:e.behavior,description:e.description,inputSchema:toInputSchema(e.inputSchema)??UNSPECIFIED_INPUT_SCHEMA,name:e.name,outputSchema:toOutputSchema(e.outputSchema),rootOnly:e.rootOnly},workflowId:t})}export{createPreparedWorkflowToolHarnessDefinition,createWorkflowToolHarnessDefinition};
+import{UNSPECIFIED_INPUT_SCHEMA,toInputSchema,toOutputSchema}from"#tools/schema.js";import{workflowIdForHandling}from"#runtime/subagents/workflow-reference.js";import{entryPointOf}from"#execution/tasks/tool-entry-point.js";import{withTaskIdInput}from"#execution/tasks/task-id-input.js";function createWorkflowToolHarnessDefinition(e){return{...entryPointOf(e.definition)===`serve`?withTaskIdInput(e.definition):e.definition,execute:void 0,executeInput:e.executeInput,workflowId:e.workflowId}}function createPreparedWorkflowToolHarnessDefinition(e){let t=workflowIdForHandling(e.behavior?.handling);if(t===void 0)throw Error(`Prepared tool "${e.name}" is not backed by a workflow.`);return createWorkflowToolHarnessDefinition({definition:{frameworkTool:e.kind!==`authored-tool`||e.owner.kind===`framework`,behavior:e.behavior,deferred:e.deferred,description:e.description,inputSchema:toInputSchema(e.inputSchema)??UNSPECIFIED_INPUT_SCHEMA,name:e.name,outputSchema:toOutputSchema(e.outputSchema),rootOnly:e.rootOnly},workflowId:t})}export{createPreparedWorkflowToolHarnessDefinition,createWorkflowToolHarnessDefinition};

package/dist/src/extensions/code/extension/extension.d.ts

@@ -1,28 +1,14 @@
 import type { SandboxSession } from "eve/sandbox";
 import { z } from "zod";
+import type { GitHubConfig } from "eve/extensions/git/sandbox";
 export type CredentialPolicyBroker = (sandbox: SandboxSession, rules: Record<string, Record<string, string>>) => Promise<void>;
-export interface GitHubLeaseRule {
-    readonly match?: {
-        readonly headers?: readonly {
-            readonly key?: {
-                readonly exact: string;
-            };
-            readonly value?: {
-                readonly exact?: string;
-                readonly regex?: string;
-            };
-        }[];
-    };
-    readonly transform: readonly {
-        readonly headers: Readonly<Record<string, string>>;
-    }[];
-}
-export type GitHubLeaseBroker = (sandbox: SandboxSession, rules: Readonly<Record<string, readonly GitHubLeaseRule[]>> | null) => Promise<void>;
+export type { GitHubLeaseRule } from "eve/extensions/git/sandbox";
+export type GitHubLeaseBroker = GitHubConfig["broker"];
 declare const _default: import("eve/extension").ExtensionHandle<z.ZodObject<{
     github: z.ZodOptional<z.ZodObject<{
         connector: z.ZodString;
         org: z.ZodString;
-        broker: z.ZodCustom<GitHubLeaseBroker, GitHubLeaseBroker>;
+        broker: z.ZodCustom<(sandbox: SandboxSession, rules: Readonly<Record<string, readonly import("eve/extensions/git/sandbox").GitHubLeaseRule[]>> | null) => Promise<void>, (sandbox: SandboxSession, rules: Readonly<Record<string, readonly import("eve/extensions/git/sandbox").GitHubLeaseRule[]>> | null) => Promise<void>>;
     }, z.core.$strip>>;
     vercel: z.ZodOptional<z.ZodObject<{
         connector: z.ZodString;

package/dist/src/extensions/code/extension/instructions/github.d.ts

@@ -0,0 +1,3 @@
+/** @deprecated Mount `eve/extensions/git` with `github` config. */
+declare const _default: import("eve/instructions").DynamicSentinel<import("eve/instructions").DynamicInstructionsResult>;
+export default _default;

package/dist/src/extensions/code/extension/instructions/github.js

@@ -0,0 +1 @@
+import{deprecatedGitHubConfigured}from"../lib/github-compat.js";import{githubInstructions}from"eve/extensions/git/sandbox";import{defineDynamic,defineInstructions}from"eve/instructions";var github_default=defineDynamic({events:{"session.started":()=>deprecatedGitHubConfigured()?defineInstructions({content:githubInstructions(!0)}):null}});export{github_default as default};

package/dist/src/extensions/code/extension/instructions.md

@@ -49,20 +49,10 @@ Required steps, in order:
 
 # Repository work
 
-GitHub credentials are not available to ordinary `bash`. Use the `gh` tool for every authenticated GitHub operation. The full `gh` CLI surface is available. Declare exactly one repository in the configured organization with write-capable access. Authenticated commands run without an approval prompt; describe the intended GitHub-side result accurately in `description`. Connect mints the real token for only the declared repository. The sandbox process receives only a placeholder `GH_TOKEN`, and the firewall exchanges it on matching GitHub requests. GitHub rejects access outside the token's server-side repository scope. Never put credentials in URLs or commands. If access is denied, report it plainly and stop.
-
-Pass commands as simple argv with ordinary quoting. Do not use environment assignments, pipes, redirects, substitutions, or other shell syntax. Commands without an explicit repository may use normal `gh` context, but their token remains scoped to the declared repository. An explicit `-R`, `--repo`, `--repo=`, or repository argument to `gh repo clone`, `view`, or `fork` must match the declaration.
-
-Determine the repositories needed to complete the task through source discovery and investigation, even when the requester does not name them. Do not ask the requester to enumerate repositories that can be discovered, and never default to the current agent's repository. The agent may select additional repositories as the work reveals them. Each authenticated command declares exactly one target repository and mints a credential lease for that repository at the moment it is needed, so cross-repository work uses separate scoped commands and leases.
-
-Clone with `gh repo clone owner/name`. Use authenticated `git fetch`, `git pull`, `git push`, and `git ls-remote` through the `gh` tool too. Local `git status`, `diff`, `add`, `commit`, and `rebase` remain ordinary `bash` commands because they need no GitHub credential. Immediately after entering a checkout and before planning or editing, read its root `AGENTS.md`; use root `CLAUDE.md` only when `AGENTS.md` is absent. Before touching any path, read the nearest nested `AGENTS.md`, falling back to `CLAUDE.md` only when that directory has no `AGENTS.md`.
+Immediately after entering a checkout and before planning or editing, read its root `AGENTS.md`; use root `CLAUDE.md` only when `AGENTS.md` is absent. Before touching any path, read the nearest nested `AGENTS.md`, falling back to `CLAUDE.md` only when that directory has no `AGENTS.md`.
 
 Do not rebase before work by default. Rebase only when the requester explicitly asks for it or when an explicitly requested publication or delivery outcome requires a current base. Inspect the worktree first and preserve pre-existing changes.
 
-Use GitHub CLI commands through the `gh` tool for issues, pull requests, reviews, Actions, CI, authentication status, configuration, aliases, extensions, and API requests. Common commands include `gh pr create --draft`, `gh pr checks`, `gh run rerun --failed`, and `gh pr review`, but they are not restrictions.
-
-Repositories that require verified signatures reject ordinary sandbox commits. Stage the intended changes explicitly, run `gh-signed-commit --repo owner/name --branch <branch> -m <headline>` through the `gh` tool, then create the draft pull request through the same tool.
-
 Use apply_patch for authored edits. Formatters and generators may write their own output. Never rewrite files through shell or Python when a focused patch is sufficient. Write small hunks against current file contents. If a hunk misses, re-read that file and rewrite only the failed hunk.
 
 Use `grep` for sandbox content search. Start with `files_with_matches` and a narrow path or glob.
@@ -73,8 +63,6 @@ Make the smallest coherent change. Run focused validation first, then broader ch
 
 Be mindful of loading large files into your context window.
 
-Load the pr skill before publishing. Create one pull request per request unless the requester asks otherwise.
-
 ## Destructive actions
 
 Before deleting, overwriting, or making data difficult to recover, confirm scope and resolve the exact target with read-only checks. Never use a home directory, repository root, workspace root, unresolved variable, broad glob, or command substitution as a recursive destructive target. Prefer recoverable operations and stop when target or authority is unclear.

package/dist/src/extensions/code/extension/lib/diagnostics.d.ts

@@ -12,7 +12,9 @@ export declare function runPostEditDiagnostics(input: {
     readonly addedPaths?: readonly string[];
     readonly changedPaths: readonly string[];
     readonly deletedPaths: readonly string[];
-    readonly repoRoot: string;
+    readonly patchRoot: string;
+    /** Content each written path had before the patch; null or absent for new files. */
+    readonly previousContents?: ReadonlyMap<string, string | null>;
     readonly sandbox: DiagnosticsSandbox;
 }): Promise<PostEditDiagnostic[]>;
 /**
@@ -22,7 +24,7 @@ export declare function runPostEditDiagnostics(input: {
  */
 export declare function runTypeScriptDiagnostics(input: {
     readonly paths: readonly string[];
-    readonly repoRoot: string;
+    readonly patchRoot: string;
     readonly sandbox: DiagnosticsSandbox;
 }): Promise<PostEditDiagnostic[]>;
 /** Drop type diagnostics that already existed before the patch, matched by path, code, and message. */

package/dist/src/extensions/code/extension/lib/diagnostics.js

@@ -1,6 +1,6 @@
-import{shellQuote}from"./shell.js";import{toolingPaths}from"./tooling.js";import{extname}from"node:path";async function runPostEditDiagnostics(e){let t=[...new Set([...e.changedPaths,...e.deletedPaths])],n=[];if(t.length>0)try{let r=await e.sandbox.run({command:`git -C ${shellQuote(e.repoRoot)} diff --check -- ${t.map(shellQuote).join(` `)}`});r.exitCode!==0&&n.push({check:`git-diff`,message:boundedDiagnostic(r.stderr||r.stdout||`git diff --check failed`)})}catch(e){n.push({check:`git-diff`,message:`Could not run git diff --check: ${errorMessage(e)}`})}for(let t of e.addedPaths??[])try{let r=await e.sandbox.readTextFile({path:`${e.repoRoot}/${t}`});if(r===null)continue;let i=whitespaceIssues(r);i.length>0&&n.push({check:`whitespace`,path:t,message:i.join(`
-`)})}catch(e){n.push({check:`whitespace`,path:t,message:`Could not inspect added file: ${errorMessage(e)}`})}for(let t=0;t<e.changedPaths.length;t+=8){let r=await Promise.all(e.changedPaths.slice(t,t+8).map(async t=>{let n=syntaxCommand(e.repoRoot,t);if(n===null)return null;try{let r=await e.sandbox.run({command:n});if(r.exitCode===0)return null;let i=r.stderr||r.stdout||`syntax check failed`;return i.includes(`ERR_UNSUPPORTED_TYPESCRIPT_SYNTAX`)?null:{check:`syntax`,path:t,message:boundedDiagnostic(i)}}catch(e){return{check:`syntax`,path:t,message:`Could not run syntax check: ${errorMessage(e)}`}}}));for(let e of r)e!==null&&n.push(e)}return n.push(...await runTypeScriptDiagnostics({paths:e.changedPaths,repoRoot:e.repoRoot,sandbox:e.sandbox})),n}async function runTypeScriptDiagnostics(e){let t=e.paths.filter(isTypeScriptPath);if(t.length===0)return[];let n=toolingPaths(e.sandbox);if(await e.sandbox.readTextFile({path:n.worker})===null)return[];let r=[];for(let i=0;i<t.length;i+=4){let a=await Promise.all(t.slice(i,i+4).map(async t=>{let r=Buffer.from(JSON.stringify({filePath:t,repoRoot:e.repoRoot,typescriptPath:n.typescriptModule}),`utf8`).toString(`base64`);try{let i=await e.sandbox.run({command:`node ${shellQuote(n.worker)}`,env:{EVE_CODE_DIAGNOSTICS_REQUEST:r}});return i.exitCode===0?(JSON.parse(i.stdout).diagnostics??[]).map(e=>({check:`typescript`,code:e.code,column:e.column,line:e.line,message:e.message,path:t})):[{check:`typescript`,path:t,message:boundedDiagnostic(i.stderr||i.stdout||`TypeScript diagnostics failed`)}]}catch(e){return[{check:`typescript`,path:t,message:`Could not run TypeScript diagnostics: ${errorMessage(e)}`}]}}));r.push(...a.flat())}return r}function onlyNewTypeDiagnostics(e,t){let n=new Map;for(let e of t){if(e.check!==`typescript`||e.code===void 0)continue;let t=typeDiagnosticKey(e);n.set(t,(n.get(t)??0)+1)}return e.filter(e=>{if(e.check!==`typescript`||e.code===void 0)return!0;let t=typeDiagnosticKey(e),r=n.get(t)??0;return r===0||(n.set(t,r-1),!1)})}function typeDiagnosticKey(e){return`${e.path??``}\0${e.code??``}\0${e.message}`}function isTypeScriptPath(e){return/\.(?:cts|mts|ts|tsx)$/u.test(e)}function syntaxCommand(e,t){let n=shellQuote(`${e}/${t}`);switch(extname(t).toLowerCase()){case`.cjs`:case`.js`:case`.mjs`:return`node --check ${n}`;case`.cts`:case`.mts`:case`.ts`:return`node --experimental-strip-types --check ${n}`;case`.json`:return`node -e ${shellQuote(`JSON.parse(require('node:fs').readFileSync(process.argv[1], 'utf8'))`)} ${n}`;case`.bash`:case`.sh`:return`bash -n ${n}`;case`.py`:return`if command -v python3 >/dev/null 2>&1; then python3 -c ${shellQuote(`import ast,pathlib,sys; ast.parse(pathlib.Path(sys.argv[1]).read_text())`)} ${n}; fi`;default:return null}}function boundedDiagnostic(e){let t=e.trim().split(`
+import{shellQuote}from"./shell.js";import{toolingPaths}from"./tooling.js";import{extname}from"node:path";async function runPostEditDiagnostics(e){let t=[...new Set([...e.changedPaths,...e.deletedPaths])],n=[],r=!1;if(t.length>0)try{let i=shellQuote(e.patchRoot),a=await e.sandbox.run({command:`git -C ${i} rev-parse --is-inside-work-tree`});if(r=a.exitCode===0&&a.stdout.trim()===`true`,r){let r=await e.sandbox.run({command:`git -C ${i} diff --check -- ${t.map(shellQuote).join(` `)}`});r.exitCode!==0&&n.push({check:`git-diff`,message:boundedDiagnostic(r.stderr||r.stdout||`git diff --check failed`)})}}catch(e){n.push({check:`git-diff`,message:`Could not run git diff --check: ${errorMessage(e)}`})}let i=r?e.addedPaths??[]:e.changedPaths;for(let t of i)try{let r=await e.sandbox.readTextFile({path:`${e.patchRoot}/${t}`});if(r===null)continue;let i=whitespaceIssues(r,e.previousContents?.get(t));i.length>0&&n.push({check:`whitespace`,path:t,message:i.join(`
+`)})}catch(e){n.push({check:`whitespace`,path:t,message:`Could not inspect written file: ${errorMessage(e)}`})}for(let t=0;t<e.changedPaths.length;t+=8){let r=await Promise.all(e.changedPaths.slice(t,t+8).map(async t=>{let n=syntaxCommand(e.patchRoot,t);if(n===null)return null;try{let r=await e.sandbox.run({command:n});if(r.exitCode===0)return null;let i=r.stderr||r.stdout||`syntax check failed`;return i.includes(`ERR_UNSUPPORTED_TYPESCRIPT_SYNTAX`)?null:{check:`syntax`,path:t,message:boundedDiagnostic(i)}}catch(e){return{check:`syntax`,path:t,message:`Could not run syntax check: ${errorMessage(e)}`}}}));for(let e of r)e!==null&&n.push(e)}return n.push(...await runTypeScriptDiagnostics({paths:e.changedPaths,patchRoot:e.patchRoot,sandbox:e.sandbox})),n}async function runTypeScriptDiagnostics(e){let t=e.paths.filter(isTypeScriptPath);if(t.length===0)return[];let n=toolingPaths(e.sandbox);if(await e.sandbox.readTextFile({path:n.worker})===null)return[];let r=[];for(let i=0;i<t.length;i+=4){let a=await Promise.all(t.slice(i,i+4).map(async t=>{let r=Buffer.from(JSON.stringify({filePath:t,patchRoot:e.patchRoot,typescriptPath:n.typescriptModule}),`utf8`).toString(`base64`);try{let i=await e.sandbox.run({command:`node ${shellQuote(n.worker)}`,env:{EVE_CODE_DIAGNOSTICS_REQUEST:r}});return i.exitCode===0?(JSON.parse(i.stdout).diagnostics??[]).map(e=>({check:`typescript`,code:e.code,column:e.column,line:e.line,message:e.message,path:t})):[{check:`typescript`,path:t,message:boundedDiagnostic(i.stderr||i.stdout||`TypeScript diagnostics failed`)}]}catch(e){return[{check:`typescript`,path:t,message:`Could not run TypeScript diagnostics: ${errorMessage(e)}`}]}}));r.push(...a.flat())}return r}function onlyNewTypeDiagnostics(e,t){let n=new Map;for(let e of t){if(e.check!==`typescript`||e.code===void 0)continue;let t=typeDiagnosticKey(e);n.set(t,(n.get(t)??0)+1)}return e.filter(e=>{if(e.check!==`typescript`||e.code===void 0)return!0;let t=typeDiagnosticKey(e),r=n.get(t)??0;return r===0||(n.set(t,r-1),!1)})}function typeDiagnosticKey(e){return`${e.path??``}\0${e.code??``}\0${e.message}`}function isTypeScriptPath(e){return/\.(?:cts|mts|ts|tsx)$/u.test(e)}function syntaxCommand(e,t){let n=shellQuote(`${e}/${t}`);switch(extname(t).toLowerCase()){case`.cjs`:case`.js`:case`.mjs`:return`node --check ${n}`;case`.cts`:case`.mts`:case`.ts`:return`node --experimental-strip-types --check ${n}`;case`.json`:return`node -e ${shellQuote(`JSON.parse(require('node:fs').readFileSync(process.argv[1], 'utf8'))`)} ${n}`;case`.bash`:case`.sh`:return`bash -n ${n}`;case`.py`:return`if command -v python3 >/dev/null 2>&1; then python3 -c ${shellQuote(`import ast,pathlib,sys; ast.parse(pathlib.Path(sys.argv[1]).read_text())`)} ${n}; fi`;default:return null}}function boundedDiagnostic(e){let t=e.trim().split(`
 `),n=t.slice(-100);for(;n.length>1&&Buffer.byteLength(n.join(`
 `),`utf8`)>8192;)n=n.slice(1);let r=t.length-n.length;return r>0?`[${r} earlier lines omitted]\n${n.join(`
 `)}`:n.join(`
-`)}function whitespaceIssues(e){let t=[];for(let[n,r]of e.split(/\r?\n/u).entries())if(/^(?:<<<<<<<|=======|>>>>>>>)(?: |$)/u.test(r)?t.push(`line ${n+1}: unresolved conflict marker`):/[\t ]+$/u.test(r)&&t.push(`line ${n+1}: trailing whitespace`),t.length===20)break;return t}function errorMessage(e){return e instanceof Error?e.message:String(e)}export{onlyNewTypeDiagnostics,runPostEditDiagnostics,runTypeScriptDiagnostics};
+`)}function whitespaceIssues(e,t){let n=new Set(t?.split(/\r?\n/u)??[]),r=[];for(let[t,i]of e.split(/\r?\n/u).entries())if(!n.has(i)&&(/^(?:<<<<<<<|=======|>>>>>>>)(?: |$)/u.test(i)?r.push(`line ${t+1}: unresolved conflict marker`):/[\t ]+$/u.test(i)&&r.push(`line ${t+1}: trailing whitespace`),r.length===20))break;return r}function errorMessage(e){return e instanceof Error?e.message:String(e)}export{onlyNewTypeDiagnostics,runPostEditDiagnostics,runTypeScriptDiagnostics};

package/dist/src/extensions/code/extension/lib/github-compat.d.ts

@@ -0,0 +1,28 @@
+export declare function deprecatedGitHubConfigured(): boolean;
+/** @deprecated Mount `eve/extensions/git` with `github` config, or import `gh` from `eve/extensions/git/tools`. */
+export declare const gh: import("../../../../tools/definition.ts").ToolDefinition<{
+    command: string;
+    permissions: {
+        provider: "github";
+        repositories: string[];
+        access: "write";
+    }[];
+    description: string;
+    workingDirectory?: string | undefined;
+}, {
+    exitCode: number;
+    stderr: string;
+    stdout: string;
+    truncated: boolean;
+}> & {
+    execute(input: {
+        command: string;
+        permissions: {
+            provider: "github";
+            repositories: string[];
+            access: "write";
+        }[];
+        description: string;
+        workingDirectory?: string | undefined;
+    }, ctx: import("../../../../tools/definition.ts").ToolContext): Promise<import("eve/extensions/git/sandbox").GitHubShellOutput>;
+};

package/dist/src/extensions/code/extension/lib/github-compat.js

@@ -0,0 +1 @@
+import extension_default from"../extension.js";import{defineGhTool}from"eve/extensions/git/sandbox";function deprecatedGitHubConfigured(){return extension_default.config.github!==void 0}const gh=defineGhTool(()=>extension_default.config.github);export{deprecatedGitHubConfigured,gh};

package/dist/src/extensions/code/extension/lib/grep-search.d.ts

@@ -1,3 +1,4 @@
+import { type WorkspaceSandbox } from "./workspace-root.ts";
 export declare const MAX_GREP_LIMIT = 200;
 export declare const MAX_GREP_COMMAND_BYTES: number;
 export declare const MAX_GREP_LINE_BYTES: number;
@@ -21,17 +22,6 @@ export interface GrepSearchResult {
     readonly path: string;
     readonly truncated: boolean;
 }
-interface GrepSandbox {
-    resolvePath(path: string): string;
-    run(input: {
-        abortSignal?: AbortSignal;
-        command: string;
-    }): PromiseLike<{
-        exitCode: number;
-        stderr: string;
-        stdout: string;
-    }>;
-}
 interface GrepToolInput {
     readonly context?: number;
     readonly glob?: string;
@@ -46,8 +36,8 @@ interface GrepToolInput {
 export declare function shouldUseFixedStrings(pattern: string, literal: boolean | undefined): boolean;
 export declare function effectiveOutputMode(outputMode: GrepOutputMode | undefined): GrepOutputMode;
 export declare function effectiveLimit(limit: number | undefined): number;
-export declare function assertWorkspacePath(resolved: string, requested?: string): string;
-export declare function executeGrepSearch(input: GrepToolInput, sandbox: GrepSandbox, abortSignal?: AbortSignal): Promise<GrepSearchResult>;
+export declare function assertNoParentSegments(resolved: string, requested?: string): string;
+export declare function executeGrepSearch(input: GrepToolInput, sandbox: WorkspaceSandbox, abortSignal?: AbortSignal): Promise<GrepSearchResult>;
 export declare function buildSearchCommand(input: GrepCommandInput): string;
 export declare function buildRipgrepCommand(input: GrepCommandInput): string;
 export declare function buildPosixGrepCommand(input: GrepCommandInput): string;

package/dist/src/extensions/code/extension/lib/grep-search.js

@@ -1,6 +1,6 @@
-import{shellQuote}from"./shell.js";const MAX_GREP_LIMIT=200,MAX_GREP_COMMAND_BYTES=262144,MAX_GREP_LINE_BYTES=8192,MAX_GREP_RETURN_BYTES=65536,REGEX_META=/[\\^$.*+?()[\]{}|]/u,GREP_OUTPUT_MODES=[`files_with_matches`,`content`,`count`];function shouldUseFixedStrings(e,t){return t===!0||t!==!1&&!REGEX_META.test(e)}function effectiveOutputMode(e){return e??`files_with_matches`}function effectiveLimit(e){return Math.min(Math.max(1,e??50),200)}function assertWorkspacePath(e,t){if(t!==void 0&&t.split(/[\\/]/u).includes(`..`))throw Error(`grep path must not contain '..'`);if(e!==`/workspace`&&!e.startsWith(`/workspace/`))throw Error(`grep path must stay under /workspace: ${e}`);if(e.split(`/`).includes(`..`))throw Error(`grep path must not contain '..'`);return e}async function executeGrepSearch(e,t,n){let r=assertWorkspacePath(t.resolvePath(e.path??`/workspace`),e.path),i=await sandboxRealPath(t,t.resolvePath(``),`sandbox workspace`,n),a=await sandboxRealPath(t,r,`grep path`,n);assertRealPathWithinWorkspace(a,i);let o=effectiveOutputMode(e.outputMode),s=effectiveLimit(e.limit),c=buildSearchCommand({contextLines:e.context??0,glob:e.glob,ignoreCase:e.ignoreCase===!0,limit:s,literal:shouldUseFixedStrings(e.pattern,e.literal),outputMode:o,path:a,pattern:e.pattern}),l=await t.run({abortSignal:n,command:c}),u=truncateUtf8(l.stdout,MAX_GREP_COMMAND_BYTES),d=u.truncated;if(l.exitCode!==0&&l.exitCode!==1||l.exitCode===1&&l.stderr.trim().length>0){let e=l.stderr.trim()||u.value.trim()||`no command output`;throw Error(`grep failed (exit ${l.exitCode}): ${truncateUtf8(e,MAX_GREP_LINE_BYTES).value}`)}return processGrepOutput({commandTruncated:d,limit:s,outputMode:o,path:r,stdout:u.value})}async function sandboxRealPath(e,t,n,r){let i=await e.run({abortSignal:r,command:`realpath -z -- ${shellQuote(t)}`});if(i.exitCode!==0){let e=i.stderr.trim()||i.stdout.trim()||`no command output`;throw Error(`${n} could not be resolved: ${truncateUtf8(e,MAX_GREP_LINE_BYTES).value}`)}let a=i.stdout.endsWith(`\0`)?i.stdout.slice(0,-1):i.stdout;if(a.length===0||a.includes(`\0`))throw Error(`${n} returned an invalid realpath`);return a}function assertRealPathWithinWorkspace(e,t){if(e!==t&&!e.startsWith(`${t}/`))throw Error(`grep path resolves outside /workspace: ${e}`)}function buildSearchCommand(e){return[`set -o pipefail`,`{`,`  if command -v rg >/dev/null 2>&1; then`,`    ${buildRipgrepCommand(e)}`,`  else`,`    ${buildPosixGrepCommand(e)}`,`  fi`,`} 2>&1 | head -c 262145`,"search_status=${PIPESTATUS[0]}",`if [ "$search_status" -eq 141 ]; then exit 0; fi`,`exit "$search_status"`].join(`
+import{shellQuote}from"./shell.js";import{resolveInWorkspace}from"./workspace-root.js";const MAX_GREP_LIMIT=200,MAX_GREP_COMMAND_BYTES=262144,MAX_GREP_LINE_BYTES=8192,MAX_GREP_RETURN_BYTES=65536,REGEX_META=/[\\^$.*+?()[\]{}|]/u,GREP_OUTPUT_MODES=[`files_with_matches`,`content`,`count`];function shouldUseFixedStrings(e,t){return t===!0||t!==!1&&!REGEX_META.test(e)}function effectiveOutputMode(e){return e??`files_with_matches`}function effectiveLimit(e){return Math.min(Math.max(1,e??50),200)}function assertNoParentSegments(e,t){if(t!==void 0&&t.split(/[\\/]/u).includes(`..`)||e.split(`/`).includes(`..`))throw Error(`grep path must not contain '..'`);return e}async function executeGrepSearch(e,t,n){let r=assertNoParentSegments(t.resolvePath(e.path??``),e.path),{path:i}=await resolveInWorkspace(t,r,`grep path`,n),a=effectiveOutputMode(e.outputMode),o=effectiveLimit(e.limit),s=buildSearchCommand({contextLines:e.context??0,glob:e.glob,ignoreCase:e.ignoreCase===!0,limit:o,literal:shouldUseFixedStrings(e.pattern,e.literal),outputMode:a,path:i,pattern:e.pattern}),c=await t.run({abortSignal:n,command:s}),l=truncateUtf8(c.stdout,MAX_GREP_COMMAND_BYTES),u=l.truncated;if(c.exitCode!==0&&c.exitCode!==1||c.exitCode===1&&c.stderr.trim().length>0){let e=c.stderr.trim()||l.value.trim()||`no command output`;throw Error(`grep failed (exit ${c.exitCode}): ${truncateUtf8(e,MAX_GREP_LINE_BYTES).value}`)}return processGrepOutput({commandTruncated:u,limit:o,outputMode:a,path:r,stdout:l.value})}function buildSearchCommand(e){return[`set -o pipefail`,`{`,`  if command -v rg >/dev/null 2>&1; then`,`    ${buildRipgrepCommand(e)}`,`  else`,`    ${buildPosixGrepCommand(e)}`,`  fi`,`} 2>&1 | head -c 262145`,"search_status=${PIPESTATUS[0]}",`if [ "$search_status" -eq 141 ]; then exit 0; fi`,`exit "$search_status"`].join(`
 `)}function buildRipgrepCommand(e){let t=[`rg`,`--color=never`,`--hidden`,`--glob`,shellQuote(`!.git/*`)];switch(e.ignoreCase&&t.push(`--ignore-case`),e.literal&&t.push(`--fixed-strings`),e.glob!==void 0&&t.push(`--glob`,shellQuote(e.glob)),e.outputMode){case`files_with_matches`:t.push(`--files-with-matches`,`--max-count`,`1`);break;case`count`:t.push(`--count`);break;case`content`:t.push(`--line-number`,`--with-filename`,`--null`),e.contextLines>0&&t.push(`--context`,String(e.contextLines)),t.push(`--max-count`,String(e.limit))}return t.push(`--`,shellQuote(e.pattern),shellQuote(e.path)),t.join(` `)}function buildPosixGrepCommand(e){let t=[`grep`,`-r`,`--exclude-dir=.git`];switch(e.ignoreCase&&t.push(`-i`),e.literal?t.push(`-F`):t.push(`-E`),e.glob!==void 0&&t.push(`--include=${shellQuote(e.glob)}`),e.outputMode){case`files_with_matches`:t.push(`-l`);break;case`count`:t.push(`-c`);break;case`content`:t.push(`-n`,`-H`,`-Z`),e.contextLines>0&&t.push(`-C`,String(e.contextLines)),t.push(`-m`,String(e.limit))}return t.push(`-e`,shellQuote(e.pattern),shellQuote(e.path)),t.join(` `)}function processGrepOutput(e){let t=e.stdout.split(`
 `),n=[],r=`
 
 [Output truncated. Narrow path or glob, or lower context.]`,i=MAX_GREP_RETURN_BYTES-Buffer.byteLength(r),a=0,o=0,s=0,c=e.commandTruncated===!0,appendLine=e=>{let t=Buffer.byteLength(e)+(n.length===0?0:1);return a+t>i?!1:(n.push(e),a+=t,!0)};for(let r=0;r<t.length;r+=1){let i=t[r]??``;if(i.length===0&&r===t.length-1)continue;if(i===`--`){if(n.length>0&&!appendLine(i)){c=!0;break}continue}let a=i,l=e.outputMode!==`content`;if(e.outputMode===`content`){let e=normalizeContentLine(i);a=e.line,l=e.isMatch}let u=0;if(e.outputMode===`count`&&(u=parseCountLine(a),u===0))continue;if(s>=e.limit){c=!0;break}let d=truncateUtf8(a,MAX_GREP_LINE_BYTES);if(d.truncated&&(c=!0),!appendLine(d.value)){c=!0;break}s+=1,e.outputMode===`count`?o+=u:l&&(o+=1)}if(n.length===0)return{content:c?`[Output truncated. Narrow path or glob, or lower context.]`:`No matches found`,matchCount:0,outputMode:e.outputMode,path:e.path,truncated:c};let l=n.join(`
-`);return c&&(l+=r),{content:l,matchCount:o,outputMode:e.outputMode,path:e.path,truncated:c}}function normalizeContentLine(e){let t=e.lastIndexOf(`\0`);if(t===-1)return{isMatch:!1,line:e};let n=e.slice(0,t),r=e.slice(t+1),i=/^(\d+)([:-])(.*)$/u.exec(r);if(i===null)return{isMatch:!1,line:`${n}:${r}`};let[,a,o,s]=i;return{isMatch:o===`:`,line:`${n}${o}${a}${o}${s}`}}function parseCountLine(e){let t=e.lastIndexOf(`:`);if(t===-1)return 0;let n=Number(e.slice(t+1));return Number.isFinite(n)&&n>0?n:0}function truncateUtf8(e,t){if(Buffer.byteLength(e)<=t)return{truncated:!1,value:e};let n=0,r=``;for(let i of e){let e=Buffer.byteLength(i);if(n+e>t)break;r+=i,n+=e}return{truncated:!0,value:r}}export{GREP_OUTPUT_MODES,MAX_GREP_COMMAND_BYTES,MAX_GREP_LIMIT,MAX_GREP_LINE_BYTES,MAX_GREP_RETURN_BYTES,assertWorkspacePath,buildPosixGrepCommand,buildRipgrepCommand,buildSearchCommand,effectiveLimit,effectiveOutputMode,executeGrepSearch,processGrepOutput,shouldUseFixedStrings};
+`);return c&&(l+=r),{content:l,matchCount:o,outputMode:e.outputMode,path:e.path,truncated:c}}function normalizeContentLine(e){let t=e.lastIndexOf(`\0`);if(t===-1)return{isMatch:!1,line:e};let n=e.slice(0,t),r=e.slice(t+1),i=/^(\d+)([:-])(.*)$/u.exec(r);if(i===null)return{isMatch:!1,line:`${n}:${r}`};let[,a,o,s]=i;return{isMatch:o===`:`,line:`${n}${o}${a}${o}${s}`}}function parseCountLine(e){let t=e.lastIndexOf(`:`);if(t===-1)return 0;let n=Number(e.slice(t+1));return Number.isFinite(n)&&n>0?n:0}function truncateUtf8(e,t){if(Buffer.byteLength(e)<=t)return{truncated:!1,value:e};let n=0,r=``;for(let i of e){let e=Buffer.byteLength(i);if(n+e>t)break;r+=i,n+=e}return{truncated:!0,value:r}}export{GREP_OUTPUT_MODES,MAX_GREP_COMMAND_BYTES,MAX_GREP_LIMIT,MAX_GREP_LINE_BYTES,MAX_GREP_RETURN_BYTES,assertNoParentSegments,buildPosixGrepCommand,buildRipgrepCommand,buildSearchCommand,effectiveLimit,effectiveOutputMode,executeGrepSearch,processGrepOutput,shouldUseFixedStrings};

package/dist/src/extensions/code/extension/lib/patch.d.ts

@@ -16,6 +16,8 @@ interface UpdateChunk {
     readonly oldLines: readonly string[];
     readonly newLines: readonly string[];
     readonly changeContext?: string;
+    /** Function context from a unified-diff range header; git may have truncated it. */
+    readonly contextHint?: string;
     readonly endOfFile?: boolean;
 }
 export interface AppliedPatchFile {
@@ -23,10 +25,14 @@ export interface AppliedPatchFile {
     readonly path: string;
     readonly previousPath?: string;
 }
+/** A verified change about to be written, with the content it replaces. */
+export interface PlannedPatchFile extends AppliedPatchFile {
+    readonly previousContent: string | null;
+}
 export declare function applyPatchToSandbox(input: {
-    readonly beforeCommit?: (files: readonly AppliedPatchFile[]) => Promise<void>;
+    readonly beforeCommit?: (files: readonly PlannedPatchFile[]) => Promise<void>;
     readonly patchText: string;
-    readonly repoRoot: string;
+    readonly patchRoot: string;
     readonly sandbox: SandboxSession;
     /** Serializes patches per eve session; every `ctx.getSandbox()` call returns a new handle. */
     readonly sessionId: string;

package/dist/src/extensions/code/extension/lib/patch.js

@@ -1,4 +1,4 @@
-import{shellQuote}from"./shell.js";import{posix}from"node:path";const patchLocks=new Map;async function applyPatchToSandbox(e){return withPatchLock(`${e.sessionId}:${e.repoRoot}`,()=>applyPatchUnlocked(e))}async function applyPatchUnlocked(e){let t=parsePatch(e.patchText);if(t.length===0)throw Error(`patch rejected: empty patch`);if(t.length>100)throw Error(`patch rejected: at most 100 file operations are allowed`);let n=await planChanges(e.sandbox,e.repoRoot,t);await e.beforeCommit?.(n.map(({operation:e,path:t,previousPath:n})=>{let r={operation:e,path:t};return n!==void 0&&(r.previousPath=n),r}));let r=[];try{for(let t of n)await revalidateChange(e.sandbox,e.repoRoot,t),r.push(t),await commitChange(e.sandbox,t)}catch(t){let n=await rollbackChanges(e.sandbox,r),i=t instanceof Error?t.message:String(t),a=n.length===0?``:` Rollback also failed: ${n.join(`; `)}`;throw Error(`apply_patch failed after validation: ${i}.${a}`,{cause:t})}return n.map(({operation:e,path:t,previousPath:n})=>{let r={operation:e,path:t};return n!==void 0&&(r.previousPath=n),r})}async function withPatchLock(e,t){let n=patchLocks.get(e)??Promise.resolve(),r,i=new Promise(e=>{r=e}),a=n.then(()=>i);patchLocks.set(e,a),await n;try{return await t()}finally{r(),patchLocks.get(e)===a&&patchLocks.delete(e)}}function parsePatch(e){let t=stripHeredoc(normalizeLineEndings(e).trim()).split(`
+import{shellQuote}from"./shell.js";import{posix}from"node:path";const patchLocks=new Map;async function applyPatchToSandbox(e){return withPatchLock(`${e.sessionId}:${e.patchRoot}`,()=>applyPatchUnlocked(e))}async function applyPatchUnlocked(e){let t=parsePatch(e.patchText);if(t.length===0)throw Error(`patch rejected: empty patch`);if(t.length>100)throw Error(`patch rejected: at most 100 file operations are allowed`);let n=await planChanges(e.sandbox,e.patchRoot,t);await e.beforeCommit?.(n.map(({operation:e,path:t,previousPath:n,oldContent:r})=>{let i={operation:e,path:t,previousContent:r};return n!==void 0&&(i.previousPath=n),i}));let r=[];try{for(let t of n)await revalidateChange(e.sandbox,e.patchRoot,t),r.push(t),await commitChange(e.sandbox,t)}catch(t){let n=await rollbackChanges(e.sandbox,r),i=t instanceof Error?t.message:String(t),a=n.length===0?``:` Rollback also failed: ${n.join(`; `)}`;throw Error(`apply_patch failed after validation: ${i}.${a}`,{cause:t})}return n.map(({operation:e,path:t,previousPath:n})=>{let r={operation:e,path:t};return n!==void 0&&(r.previousPath=n),r})}async function withPatchLock(e,t){let n=patchLocks.get(e)??Promise.resolve(),r,i=new Promise(e=>{r=e}),a=n.then(()=>i);patchLocks.set(e,a),await n;try{return await t()}finally{r(),patchLocks.get(e)===a&&patchLocks.delete(e)}}function parsePatch(e){let t=stripHeredoc(normalizeLineEndings(e).trim()).split(`
 `),n=t.findIndex(e=>e.trim()===`*** Begin Patch`),r=t.findIndex((e,t)=>t>n&&e.trim()===`*** End Patch`);if(n===-1||r===-1||n>=r)throw Error(`invalid patch format: missing Begin/End markers`);if(t.slice(0,n).some(e=>e.trim().length>0&&!e.trimStart().startsWith(`*** Environment ID:`)))throw Error(`invalid patch format: unexpected content before Begin Patch`);if(t.slice(r+1).some(e=>e.trim().length>0))throw Error(`invalid patch format: unexpected content after End Patch`);let i=[],a=n+1;for(;a<r;){let e=t[a]??``;if(e.startsWith(`*** Environment ID:`)){a+=1;continue}if(e.startsWith(`*** Add File:`)){let n=requirePath(e.slice(13),`add`),o=parseAdd(t,a+1,r);i.push({type:`add`,path:n,contents:o.content}),a=o.next;continue}if(e.startsWith(`*** Delete File:`)){i.push({type:`delete`,path:requirePath(e.slice(16),`delete`)}),a+=1;continue}if(e.startsWith(`*** Update File:`)){let n=requirePath(e.slice(16),`update`),o=a+1,s;t[o]?.startsWith(`*** Move to:`)&&(s=requirePath(t[o].slice(12),`move`),o+=1);let c=parseUpdate(t,o,r);if(c.chunks.length===0&&s===void 0)throw Error(`invalid update hunk for ${n}: expected at least one @@ chunk`);i.push({type:`update`,path:n,movePath:s,chunks:c.chunks}),a=c.next;continue}throw Error(`invalid patch line: ${e}`)}return i}function deriveUpdatedContent(e,t,n){let r=n.includes(`\r
 `)?`\r
 `:`
@@ -6,15 +6,15 @@ import{shellQuote}from"./shell.js";import{posix}from"node:path";const patchLocks
 `);a.at(-1)===``&&a.pop();let o=computeReplacements(a,e,t),s=[...a];for(let[e,t,n]of o.toReversed())s.splice(e,t,...n);s.at(-1)!==``&&s.push(``);let c=s.join(`
 `).replaceAll(`
 `,r);return i.bom?`\uFEFF${c}`:c}function parseAdd(e,t,n){let r=[],i=t;for(;i<n&&!e[i].startsWith(`***`);){let t=e[i];if(!t.startsWith(`+`))throw Error(`invalid add file line: ${t}`);r.push(t.slice(1)),i+=1}return{content:r.join(`
-`),next:i}}function parseUpdate(e,t,n){let r=[],i=t;for(;i<n&&!e[i].startsWith(`***`);){let t=e[i],a=t.startsWith(`@@`);if(!a&&r.length>0)throw Error(`invalid update file line: ${e[i]}`);let o=a&&t.slice(2).trim()||void 0,s=[],c=[],l=!1;for(a&&(i+=1);i<n&&!e[i].startsWith(`@@`);){let t=e[i];if(t===`*** End of File`){for(l=!0,i+=1;i<n&&e[i]===``;)i+=1;break}if(t.startsWith(`***`))break;if(t===``)s.push(``),c.push(``);else if(t.startsWith(` `))s.push(t.slice(1)),c.push(t.slice(1));else if(t.startsWith(`-`))s.push(t.slice(1));else if(t.startsWith(`+`))c.push(t.slice(1));else throw Error(`invalid update chunk line: ${t}`);i+=1}r.push({oldLines:s,newLines:c,changeContext:o,endOfFile:l||void 0})}return{chunks:r,next:i}}async function planChanges(e,t,n){if(await realPath(e,t)!==t)throw Error(`apply_patch verification failed: repository root resolves outside itself: ${t}`);let r=new Set,i=[],a=[];for(let o of n)try{i.push(await planHunk(e,t,r,o))}catch(e){a.push(e instanceof Error?e.message:String(e))}if(a.length>0)throw Error(a.join(`
+`),next:i}}const UNIFIED_RANGE_HEADER=/^-\d+(?:,\d+)? \+\d+(?:,\d+)? @@\s*(.*)$/u;function chunkHeader(e){let t=e.slice(2).trim();if(t.length===0)return{changeContext:void 0};let n=UNIFIED_RANGE_HEADER.exec(t);if(!n)return{changeContext:t};let r=n[1].trim();return r.length===0?{changeContext:void 0}:{changeContext:void 0,contextHint:r}}function parseUpdate(e,t,n){let r=[],i=t;for(;i<n&&!e[i].startsWith(`***`);){let t=e[i],a=t.startsWith(`@@`);if(!a&&r.length>0)throw Error(`invalid update file line: ${e[i]}`);let o=a?chunkHeader(t):{changeContext:void 0},s=[],c=[],l=!1;for(a&&(i+=1);i<n&&!e[i].startsWith(`@@`);){let t=e[i];if(t===`*** End of File`){for(l=!0,i+=1;i<n&&e[i]===``;)i+=1;break}if(t.startsWith(`***`))break;if(t===``)s.push(``),c.push(``);else if(t.startsWith(` `))s.push(t.slice(1)),c.push(t.slice(1));else if(t.startsWith(`-`))s.push(t.slice(1));else if(t.startsWith(`+`))c.push(t.slice(1));else throw Error(`invalid update chunk line: ${t}`);i+=1}r.push({oldLines:s,newLines:c,...o,endOfFile:l||void 0})}return{chunks:r,next:i}}async function planChanges(e,t,n){if(await realPath(e,t)!==t)throw Error(`apply_patch verification failed: patch root resolves outside itself: ${t}`);let r=new Set,i=[],a=[];for(let o of n)try{i.push(await planHunk(e,t,r,o))}catch(e){a.push(e instanceof Error?e.message:String(e))}if(a.length>0)throw Error(a.join(`
 
 `));return i}async function planHunk(e,t,n,r){let i=resolvePatchPath(t,r.path);if(await assertRealPath(e,t,i.absolutePath),claimPath(n,i.absolutePath),r.type===`add`){if(await e.readTextFile({path:i.absolutePath})!==null)throw Error(`apply_patch verification failed: file already exists: ${i.path}`);return{absolutePath:i.absolutePath,newContent:r.contents.length===0||r.contents.endsWith(`
-`)?r.contents:`${r.contents}\n`,oldContent:null,operation:`add`,path:i.path}}let a=await e.readTextFile({path:i.absolutePath});if(a===null)throw Error(`apply_patch verification failed: file not found: ${i.path}`);let o=await fileMode(e,i.absolutePath);if(r.type===`delete`)return{absolutePath:i.absolutePath,newContent:null,oldContent:a,oldMode:o,operation:`delete`,path:i.path};let s=r.movePath===void 0?i:resolvePatchPath(t,r.movePath);if(s.absolutePath!==i.absolutePath&&(await assertRealPath(e,t,s.absolutePath),claimPath(n,s.absolutePath),await e.readTextFile({path:s.absolutePath})!==null))throw Error(`apply_patch verification failed: move target already exists: ${s.path}`);let c=r.chunks.length===0?a:deriveUpdatedContent(i.path,r.chunks,a);if(c===a&&s.absolutePath===i.absolutePath)throw Error(`apply_patch verification failed: update makes no changes: ${i.path}`);let l={absolutePath:s.absolutePath,newContent:c,oldContent:a,oldMode:o,operation:s.absolutePath===i.absolutePath?`update`:`move`,path:s.path};return s.absolutePath!==i.absolutePath&&(l.previousAbsolutePath=i.absolutePath,l.previousPath=i.path),l}async function commitChange(e,t){if(t.operation===`delete`){await e.removePath({path:t.absolutePath});return}if(t.operation===`move`&&t.previousAbsolutePath!==void 0){await atomicWrite(e,{content:t.newContent??``,mode:t.oldMode,overwrite:!1,path:t.absolutePath}),await e.removePath({path:t.previousAbsolutePath});return}await atomicWrite(e,{content:t.newContent??``,mode:t.oldMode,overwrite:t.operation!==`add`,path:t.absolutePath})}async function revalidateChange(e,t,n){if(await assertRealPath(e,t,n.absolutePath),n.operation===`add`){if(await e.readTextFile({path:n.absolutePath})!==null)throw Error(`apply_patch stale write: add target now exists: ${n.path}`);return}if(n.operation===`move`&&n.previousAbsolutePath!==void 0){await assertRealPath(e,t,n.previousAbsolutePath);let[r,i]=await Promise.all([e.readTextFile({path:n.previousAbsolutePath}),e.readTextFile({path:n.absolutePath})]);if(r!==n.oldContent||i!==null)throw Error(`apply_patch stale write: move inputs changed: ${n.previousPath}`);return}if(await e.readTextFile({path:n.absolutePath})!==n.oldContent)throw Error(`apply_patch stale write: file changed after validation: ${n.path}`)}async function rollbackChanges(e,t){let n=[];for(let r of t.toReversed())try{let t=await e.readTextFile({path:r.absolutePath});if(r.operation===`add`){if(t===null)continue;if(t!==r.newContent)throw Error(`refusing to remove concurrently changed file ${r.path}`);await e.removePath({path:r.absolutePath})}else if(r.operation===`move`&&r.previousAbsolutePath!==void 0){let n=await e.readTextFile({path:r.previousAbsolutePath});if(t===r.newContent&&n===null)await atomicWrite(e,{content:r.oldContent??``,mode:r.oldMode,overwrite:!1,path:r.previousAbsolutePath}),await e.removePath({path:r.absolutePath});else if(t===r.newContent&&n===r.oldContent)await e.removePath({path:r.absolutePath});else if(t===null&&n===r.newContent)await atomicWrite(e,{content:r.oldContent??``,mode:r.oldMode,overwrite:!0,path:r.previousAbsolutePath});else if(t!==null||n!==r.oldContent)throw Error(`refusing to roll back concurrently changed move ${r.path}`)}else if(r.operation===`delete`){if(t===null)await atomicWrite(e,{content:r.oldContent??``,mode:r.oldMode,overwrite:!1,path:r.absolutePath});else if(t!==r.oldContent)throw Error(`refusing to overwrite concurrently recreated file ${r.path}`)}else{if(t===r.oldContent)continue;if(t!==r.newContent)throw Error(`refusing to overwrite concurrently changed file ${r.path}`);await atomicWrite(e,{content:r.oldContent??``,mode:r.oldMode,overwrite:!0,path:r.absolutePath})}}catch(e){n.push(e instanceof Error?e.message:String(e))}return n}async function assertRealPath(e,t,n){let r=await realPath(e,n);if(r!==n||!r.startsWith(`${t}/`))throw Error(`apply_patch verification failed: path crosses a symlink or repository boundary: ${n}`)}async function realPath(e,t){let n=await e.run({command:`realpath -m -- ${shellQuote(t)}`});if(n.exitCode!==0)throw Error(`apply_patch verification failed: could not resolve ${t}: ${n.stderr}`);return n.stdout.trim()}async function ensureParentDirectory(e,t){let n=await e.run({command:`mkdir -p -- ${shellQuote(posix.dirname(t))}`});if(n.exitCode!==0)throw Error(`failed to create parent directory for ${t}: ${n.stderr}`)}async function atomicWrite(e,t){await ensureParentDirectory(e,t.path);let n=posix.join(posix.dirname(t.path),`.${posix.basename(t.path)}.eve-code-${crypto.randomUUID()}.tmp`),r=!1;try{await e.writeTextFile({path:n,content:t.content}),await restoreMode(e,n,t.mode);let i=await e.run({command:`mv ${t.overwrite?``:`-n `}-- ${shellQuote(n)} ${shellQuote(t.path)}`});if(i.exitCode!==0)throw Error(`failed to install ${t.path}: ${i.stderr||i.stdout}`);if(!t.overwrite&&await e.readTextFile({path:n})!==null)throw Error(`apply_patch stale write: target now exists: ${t.path}`);r=!0}finally{r||await e.removePath({path:n,force:!0}).catch(()=>{})}}async function fileMode(e,t){let n=await e.run({command:`stat -c %a -- ${shellQuote(t)}`}),r=n.stdout.trim();if(n.exitCode!==0||!/^[0-7]{3,4}$/u.test(r))throw Error(`apply_patch verification failed: could not read file mode for ${t}`);return r}async function restoreMode(e,t,n){if(n!==void 0&&(await e.run({command:`chmod ${n} -- ${shellQuote(t)}`})).exitCode!==0)throw Error(`failed to restore file mode for ${t}`)}function resolvePatchPath(e,t){let n=t.replaceAll(`\\`,`/`).trim();if(n.length===0||n.includes(`\0`)||posix.isAbsolute(n)||n.split(`/`).some(e=>e===``||e===`.`||e===`..`))throw Error(`invalid patch path: ${t}`);return{absolutePath:posix.join(e,n),path:n}}function claimPath(e,t){if(e.has(t))throw Error(`patch contains overlapping file operations: ${t}`);e.add(t)}function requirePath(e,t){let n=e.trim();if(n.length===0)throw Error(`invalid ${t} file path`);return n}function computeReplacements(e,t,n){let r=[],i=0;for(let a of n){if(a.changeContext!==void 0){let n=seek(e,[a.changeContext],i);if(n===-1)throw Error(formatMissingContextError(t,a.changeContext,e,i));i=n+1}if(a.oldLines.length===0){r.push([e.length,0,a.newLines]);continue}let n=a.oldLines,o=a.newLines,s=seek(e,n,i,a.endOfFile);if(s===-1&&n.at(-1)===``&&(n=n.slice(0,-1),o.at(-1)===``&&(o=o.slice(0,-1)),s=seek(e,n,i,a.endOfFile)),s===-1)throw Error(formatMissingLinesError(t,a.oldLines,e,i));r.push([s,n.length,o]),i=s+n.length}return r.toSorted((e,t)=>e[0]-t[0])}function formatMissingLinesError(e,t,n,r){return[`failed to find expected lines in ${e}.`,``,`Expected:`,boundLines(t,20),``,currentExcerpt(n,t,r),``,`Re-read ${e} and rewrite this hunk against the current contents.`].join(`
+`)?r.contents:`${r.contents}\n`,oldContent:null,operation:`add`,path:i.path}}let a=await e.readTextFile({path:i.absolutePath});if(a===null)throw Error(`apply_patch verification failed: file not found: ${i.path}`);let o=await fileMode(e,i.absolutePath);if(r.type===`delete`)return{absolutePath:i.absolutePath,newContent:null,oldContent:a,oldMode:o,operation:`delete`,path:i.path};let s=r.movePath===void 0?i:resolvePatchPath(t,r.movePath);if(s.absolutePath!==i.absolutePath&&(await assertRealPath(e,t,s.absolutePath),claimPath(n,s.absolutePath),await e.readTextFile({path:s.absolutePath})!==null))throw Error(`apply_patch verification failed: move target already exists: ${s.path}`);let c=r.chunks.length===0?a:deriveUpdatedContent(i.path,r.chunks,a);if(c===a&&s.absolutePath===i.absolutePath)throw Error(`apply_patch verification failed: update makes no changes: ${i.path}`);let l={absolutePath:s.absolutePath,newContent:c,oldContent:a,oldMode:o,operation:s.absolutePath===i.absolutePath?`update`:`move`,path:s.path};return s.absolutePath!==i.absolutePath&&(l.previousAbsolutePath=i.absolutePath,l.previousPath=i.path),l}async function commitChange(e,t){if(t.operation===`delete`){await e.removePath({path:t.absolutePath});return}if(t.operation===`move`&&t.previousAbsolutePath!==void 0){await atomicWrite(e,{content:t.newContent??``,mode:t.oldMode,overwrite:!1,path:t.absolutePath}),await e.removePath({path:t.previousAbsolutePath});return}await atomicWrite(e,{content:t.newContent??``,mode:t.oldMode,overwrite:t.operation!==`add`,path:t.absolutePath})}async function revalidateChange(e,t,n){if(await assertRealPath(e,t,n.absolutePath),n.operation===`add`){if(await e.readTextFile({path:n.absolutePath})!==null)throw Error(`apply_patch stale write: add target now exists: ${n.path}`);return}if(n.operation===`move`&&n.previousAbsolutePath!==void 0){await assertRealPath(e,t,n.previousAbsolutePath);let[r,i]=await Promise.all([e.readTextFile({path:n.previousAbsolutePath}),e.readTextFile({path:n.absolutePath})]);if(r!==n.oldContent||i!==null)throw Error(`apply_patch stale write: move inputs changed: ${n.previousPath}`);return}if(await e.readTextFile({path:n.absolutePath})!==n.oldContent)throw Error(`apply_patch stale write: file changed after validation: ${n.path}`)}async function rollbackChanges(e,t){let n=[];for(let r of t.toReversed())try{let t=await e.readTextFile({path:r.absolutePath});if(r.operation===`add`){if(t===null)continue;if(t!==r.newContent)throw Error(`refusing to remove concurrently changed file ${r.path}`);await e.removePath({path:r.absolutePath})}else if(r.operation===`move`&&r.previousAbsolutePath!==void 0){let n=await e.readTextFile({path:r.previousAbsolutePath});if(t===r.newContent&&n===null)await atomicWrite(e,{content:r.oldContent??``,mode:r.oldMode,overwrite:!1,path:r.previousAbsolutePath}),await e.removePath({path:r.absolutePath});else if(t===r.newContent&&n===r.oldContent)await e.removePath({path:r.absolutePath});else if(t===null&&n===r.newContent)await atomicWrite(e,{content:r.oldContent??``,mode:r.oldMode,overwrite:!0,path:r.previousAbsolutePath});else if(t!==null||n!==r.oldContent)throw Error(`refusing to roll back concurrently changed move ${r.path}`)}else if(r.operation===`delete`){if(t===null)await atomicWrite(e,{content:r.oldContent??``,mode:r.oldMode,overwrite:!1,path:r.absolutePath});else if(t!==r.oldContent)throw Error(`refusing to overwrite concurrently recreated file ${r.path}`)}else{if(t===r.oldContent)continue;if(t!==r.newContent)throw Error(`refusing to overwrite concurrently changed file ${r.path}`);await atomicWrite(e,{content:r.oldContent??``,mode:r.oldMode,overwrite:!0,path:r.absolutePath})}}catch(e){n.push(e instanceof Error?e.message:String(e))}return n}async function assertRealPath(e,t,n){let r=await realPath(e,n);if(r!==n||!r.startsWith(`${t}/`))throw Error(`apply_patch verification failed: path crosses a symlink or repository boundary: ${n}`)}async function realPath(e,t){let n=await e.run({command:`realpath -m -- ${shellQuote(t)}`});if(n.exitCode!==0)throw Error(`apply_patch verification failed: could not resolve ${t}: ${n.stderr}`);return n.stdout.trim()}async function ensureParentDirectory(e,t){let n=await e.run({command:`mkdir -p -- ${shellQuote(posix.dirname(t))}`});if(n.exitCode!==0)throw Error(`failed to create parent directory for ${t}: ${n.stderr}`)}async function atomicWrite(e,t){await ensureParentDirectory(e,t.path);let n=posix.join(posix.dirname(t.path),`.${posix.basename(t.path)}.eve-code-${crypto.randomUUID()}.tmp`),r=!1;try{await e.writeTextFile({path:n,content:t.content}),await restoreMode(e,n,t.mode);let i=await e.run({command:`mv ${t.overwrite?``:`-n `}-- ${shellQuote(n)} ${shellQuote(t.path)}`});if(i.exitCode!==0)throw Error(`failed to install ${t.path}: ${i.stderr||i.stdout}`);if(!t.overwrite&&await e.readTextFile({path:n})!==null)throw Error(`apply_patch stale write: target now exists: ${t.path}`);r=!0}finally{r||await e.removePath({path:n,force:!0}).catch(()=>{})}}async function fileMode(e,t){let n=await e.run({command:`stat -c %a -- ${shellQuote(t)}`}),r=n.stdout.trim();if(n.exitCode!==0||!/^[0-7]{3,4}$/u.test(r))throw Error(`apply_patch verification failed: could not read file mode for ${t}`);return r}async function restoreMode(e,t,n){if(n!==void 0&&(await e.run({command:`chmod ${n} -- ${shellQuote(t)}`})).exitCode!==0)throw Error(`failed to restore file mode for ${t}`)}function resolvePatchPath(e,t){let n=t.replaceAll(`\\`,`/`).trim();if(n.length===0||n.includes(`\0`)||posix.isAbsolute(n)||n.split(`/`).some(e=>e===``||e===`.`||e===`..`))throw Error(`invalid patch path: ${t}`);return{absolutePath:posix.join(e,n),path:n}}function claimPath(e,t){if(e.has(t))throw Error(`patch contains overlapping file operations: ${t}`);e.add(t)}function requirePath(e,t){let n=e.trim();if(n.length===0)throw Error(`invalid ${t} file path`);return n}function computeReplacements(e,t,n){let r=[],i=0;for(let a of n){if(a.changeContext!==void 0){let n=seek(e,[a.changeContext],i);if(n===-1)throw Error(formatMissingContextError(t,a.changeContext,e,i));i=n+1}if(a.contextHint!==void 0){let n=seekPrefix(e,a.contextHint,i);if(n!==-1)i=n+1;else if(occurrences(e,a,i)!==1)throw Error(formatMissingContextError(t,a.contextHint,e,i))}if(a.oldLines.length===0){r.push([e.length,0,a.newLines]);continue}let n=a.oldLines,o=a.newLines,s=seek(e,n,i,a.endOfFile);if(s===-1&&n.at(-1)===``&&(n=n.slice(0,-1),o.at(-1)===``&&(o=o.slice(0,-1)),s=seek(e,n,i,a.endOfFile)),s===-1)throw Error(formatMissingLinesError(t,a.oldLines,e,i));r.push([s,n.length,o]),i=s+n.length}return r.toSorted((e,t)=>e[0]-t[0])}function formatMissingLinesError(e,t,n,r){return[`failed to find expected lines in ${e}.`,``,`Expected:`,boundLines(t,20),``,currentExcerpt(n,t,r),``,`Re-read ${e} and rewrite this hunk against the current contents.`].join(`
 `)}function formatMissingContextError(e,t,n,r){return[`failed to find context '${t}' in ${e}.`,``,currentExcerpt(n,[t],r),``,`Re-read ${e} and rewrite this hunk against the current contents.`].join(`
 `)}function currentExcerpt(e,t,n){if(e.length===0)return`Current file is empty.`;let r=closestMatchIndex(e,t,n),i=r===-1?Math.min(n,Math.max(0,e.length-1)):r,a=Math.max(0,i-4),o=Math.min(e.length,a+16);return`${r===-1?`Current contents from line ${a+1}:`:`Closest current content:`}\n${numberedLines(e,a,o)}`}function closestMatchIndex(e,t,n){let r=t.map(e=>e.trim()).filter(e=>e.length>0).toSorted((e,t)=>t.length-e.length).slice(0,3);for(let t of r){let r=seek(e,[t],n);if(r!==-1)return r;let i=seek(e,[t],0);if(i!==-1)return i}return closestScoredLine(e,t)}function closestScoredLine(e,t){let n=new Set(t.join(` `).toLowerCase().split(/\W+/u).filter(e=>e.length>2));if(n.size===0)return-1;let r=-1,i=0;for(let t=0;t<e.length;t+=1){let a=0;for(let r of e[t].toLowerCase().split(/\W+/u))n.has(r)&&(a+=1);a>i&&(i=a,r=t)}return i>=2?r:-1}function boundLines(e,t){return e.length<=t?e.join(`
 `):`${e.slice(0,t).join(`
 `)}\n[${e.length-t} more expected lines omitted]`}function numberedLines(e,t,n){let r=String(n).length;return e.slice(t,n).map((e,n)=>`${String(t+n+1).padStart(r,` `)} | ${e}`).join(`
-`)}function seek(e,t,n,r=!1){if(t.length===0)return-1;for(let i of[exact,trimEnd,trim,normalized]){if(r){let r=e.length-t.length;if(r>=n&&matches(e,t,r,i))return r}for(let r=n;r<=e.length-t.length;r+=1)if(matches(e,t,r,i))return r}return-1}function matches(e,t,n,r){return t.every((t,i)=>r(e[n+i],t))}const exact=(e,t)=>e===t,trimEnd=(e,t)=>e.trimEnd()===t.trimEnd(),trim=(e,t)=>e.trim()===t.trim(),normalized=(e,t)=>normalizeTypography(e.trim())===normalizeTypography(t.trim());function normalizeTypography(e){return e.replace(/[‘’‚‛]/gu,`'`).replace(/[“”„‟]/gu,`"`).replace(/[‐‑‒–—―]/gu,`-`).replace(/…/gu,`...`).replace(/ /gu,` `)}function normalizeLineEndings(e){return e.replaceAll(`\r
+`)}function seek(e,t,n,r=!1){if(t.length===0)return-1;for(let i of[exact,trimEnd,trim,normalized]){if(r){let r=e.length-t.length;if(r>=n&&matches(e,t,r,i))return r}for(let r=n;r<=e.length-t.length;r+=1)if(matches(e,t,r,i))return r}return-1}function occurrences(e,t,n){let r=seekAll(e,t.oldLines,n,t.endOfFile);return r.length>0||t.oldLines.at(-1)!==``?r.length:seekAll(e,t.oldLines.slice(0,-1),n,t.endOfFile).length}function seekAll(e,t,n,r=!1){if(t.length===0)return[];for(let i of[exact,trimEnd,trim,normalized]){let a=e.length-t.length;if(r&&a>=n&&matches(e,t,a,i))return[a];let o=[];for(let r=n;r<=a;r+=1)matches(e,t,r,i)&&o.push(r);if(o.length>0)return o}return[]}function seekPrefix(e,t,n){let r=normalizeTypography(t.trim());for(let t=n;t<e.length;t+=1)if(normalizeTypography(e[t].trim()).startsWith(r))return t;return-1}function matches(e,t,n,r){return t.every((t,i)=>r(e[n+i],t))}const exact=(e,t)=>e===t,trimEnd=(e,t)=>e.trimEnd()===t.trimEnd(),trim=(e,t)=>e.trim()===t.trim(),normalized=(e,t)=>normalizeTypography(e.trim())===normalizeTypography(t.trim());function normalizeTypography(e){return e.replace(/[‘’‚‛]/gu,`'`).replace(/[“”„‟]/gu,`"`).replace(/[‐‑‒–—―]/gu,`-`).replace(/…/gu,`...`).replace(/ /gu,` `)}function normalizeLineEndings(e){return e.replaceAll(`\r
 `,`
 `).replaceAll(`\r`,`
 `)}function splitBom(e){return e.startsWith(``)?{bom:!0,text:e.slice(1)}:{bom:!1,text:e}}function stripHeredoc(e){return e.match(/^(?:cat\s+)?<<['"]?(\w+)['"]?\s*\n([\s\S]*?)\n\1\s*$/u)?.[2]??e}export{applyPatchToSandbox,deriveUpdatedContent,parsePatch};

package/dist/src/extensions/code/extension/lib/repository-root.d.ts

@@ -1,4 +1,3 @@
-import type { SandboxSession } from "eve/sandbox";
-type RootSandbox = Pick<SandboxSession, "resolvePath" | "run">;
-export declare function validateRepositoryRoot(sandbox: RootSandbox, root: string): Promise<string>;
-export {};
+import { type WorkspaceSandbox } from "./workspace-root.ts";
+/** A workspace directory that must also be the top of a git work tree. */
+export declare function validateRepositoryRoot(sandbox: WorkspaceSandbox, root: string): Promise<string>;

package/dist/src/extensions/code/extension/lib/repository-root.js

@@ -1 +1 @@
-import{shellQuote}from"./shell.js";async function validateRepositoryRoot(e,t){if(!t.startsWith(`/`))throw Error(`root must be an absolute sandbox path`);let n=await realPath(e,e.resolvePath(``),`sandbox workspace`),r=await realPath(e,t,`root`);if(r!==n&&!r.startsWith(`${n}/`))throw Error(`root must be inside the sandbox workspace: ${t}`);let i=await e.run({command:`git -C ${shellQuote(r)} rev-parse --show-toplevel`});if(i.exitCode!==0||i.stdout.trim()!==r)throw Error(`root is not a git work tree root: ${t}`);return r}async function realPath(e,t,n){let r=await e.run({command:`realpath -e -- ${shellQuote(t)}`});if(r.exitCode!==0)throw Error(`Could not resolve ${n} ${t}: ${r.stderr}`);return r.stdout.trim()}export{validateRepositoryRoot};
+import{shellQuote}from"./shell.js";import{resolveWorkspaceDirectory}from"./workspace-root.js";async function validateRepositoryRoot(e,t){let n=await resolveWorkspaceDirectory(e,t),r=await e.run({command:`git -C ${shellQuote(n)} rev-parse --show-toplevel`});if(r.exitCode!==0||r.stdout.trim()!==n)throw Error(`root is not a git work tree root: ${t}`);return n}export{validateRepositoryRoot};

package/dist/src/extensions/code/extension/lib/sandbox.d.ts

@@ -10,4 +10,5 @@ export declare function installCodeTooling(sandbox: ToolingSandbox, options?: {
 export { authenticateGitHub, authenticateVercel, type BrokeredCredentialOptions, } from "./credentials.ts";
 /** @deprecated Import from `eve/computer-use/sandbox` and mount `eve/computer-use`. */
 export { COMPUTER_USE_REVALIDATION_KEY, installComputerUse, startComputerUse, } from "eve/computer-use/sandbox";
-export { executeGitHubShell, githubShellApproval, type GitHubLeaseRule, type GitHubShellInput, type GitHubShellOutput, } from "./github-shell.ts";
+/** @deprecated Import from `eve/extensions/git/sandbox`. */
+export { executeGitHubShell, githubShellApproval, type GitHubLeaseRule, type GitHubShellInput, type GitHubShellOutput, } from "eve/extensions/git/sandbox";

package/dist/src/extensions/code/extension/lib/sandbox.js

@@ -1,2 +1,2 @@
-import{GH_SIGNED_COMMIT_SOURCE}from"./signed-commit.js";import{DIAGNOSTICS_WORKER_SOURCE,TYPESCRIPT_VERSION,ghWrapperSource,toolingPaths,typescriptInstallCommand,vercelWrapperSource}from"./tooling.js";import{authenticateGitHub,authenticateVercel}from"./credentials.js";import{commandFailureDetail}from"./command-failure.js";import{executeGitHubShell,githubShellApproval}from"./github-shell.js";import{COMPUTER_USE_REVALIDATION_KEY,installComputerUse,startComputerUse}from"eve/computer-use/sandbox";const CODE_TOOLING_REVALIDATION_KEY=`eve-code-tooling:3:3:${TYPESCRIPT_VERSION}`;async function installCodeTooling(e,t={}){let n=toolingPaths(e);await Promise.all([e.writeTextFile({path:n.ghWrapper,content:ghWrapperSource(e)}),e.writeTextFile({path:n.signedCommit,content:GH_SIGNED_COMMIT_SOURCE}),e.writeTextFile({path:n.workerSource,content:DIAGNOSTICS_WORKER_SOURCE}),...t.vercel===!0?[e.writeTextFile({path:n.vercelWrapper,content:vercelWrapperSource(e)})]:[]]);let r=await e.run({command:toolingInstallCommand(e,t.vercel===!0)});if(r.exitCode!==0)throw Error(`eve-code tooling installation failed (exit ${r.exitCode}): ${commandFailureDetail(r)}`)}function toolingInstallCommand(e,t){let n=toolingPaths(e),quote=e=>`'${e.replaceAll(`'`,`'"'"'`)}'`;return[`set -e`,`mkdir -p ${quote(n.root)}`,`if ! command -v gh >/dev/null 2>&1; then`,`  command -v apt-get >/dev/null 2>&1 || { echo 'eve-code requires gh or apt-get' >&2; exit 1; }`,`  if [ "$(id -u)" = 0 ]; then APT=apt-get; else command -v sudo >/dev/null 2>&1 || { echo 'eve-code needs root or sudo to install gh' >&2; exit 1; }; APT='sudo -n apt-get'; fi`,`  $APT update && $APT install -y gh`,`fi`,`chmod 755 ${quote(n.ghWrapper)} ${quote(n.signedCommit)}`,`if [ "$(id -u)" = 0 ]; then INSTALL=install; else INSTALL='sudo -n install'; fi`,`$INSTALL -d -o root -g root -m 755 ${quote(n.trustedRoot)} ${quote(n.typescriptRoot)}`,`[ -x /usr/bin/gh ] || { echo 'eve-code requires gh at /usr/bin/gh' >&2; exit 1; }`,`$INSTALL -m 755 /usr/bin/gh ${quote(n.ghReal)}`,`$INSTALL -m 755 ${quote(n.signedCommit)} ${quote(n.trustedSignedCommit)}`,`$INSTALL -m 644 ${quote(n.workerSource)} ${quote(n.worker)}`,`$INSTALL -m 755 ${quote(n.ghWrapper)} /usr/local/bin/gh`,`$INSTALL -m 755 ${quote(n.trustedSignedCommit)} /usr/local/bin/gh-signed-commit`,typescriptInstallCommand(e),...t?[`if [ "$(id -u)" = 0 ]; then npm install -g vercel@latest; else sudo -n npm install -g vercel@latest; fi`,`$INSTALL -m 755 ${quote(n.vercelWrapper)} /usr/local/bin/vercel`,`$INSTALL -m 755 ${quote(n.vercelWrapper)} /usr/local/bin/vc`]:[]].join(`
+import{DIAGNOSTICS_WORKER_SOURCE,GH_SIGNED_COMMIT_SOURCE,GH_SIGNED_COMMIT_VERSION,TYPESCRIPT_VERSION,ghWrapperSource,toolingPaths,typescriptInstallCommand,vercelWrapperSource}from"./tooling.js";import{authenticateGitHub,authenticateVercel}from"./credentials.js";import{commandFailureDetail}from"./command-failure.js";import{executeGitHubShell,githubShellApproval}from"eve/extensions/git/sandbox";import{COMPUTER_USE_REVALIDATION_KEY,installComputerUse,startComputerUse}from"eve/computer-use/sandbox";const CODE_TOOLING_REVALIDATION_KEY=`eve-code-tooling:3:${GH_SIGNED_COMMIT_VERSION}:${TYPESCRIPT_VERSION}`;async function installCodeTooling(e,t={}){let n=toolingPaths(e);await Promise.all([e.writeTextFile({path:n.ghWrapper,content:ghWrapperSource(e)}),e.writeTextFile({path:n.signedCommit,content:GH_SIGNED_COMMIT_SOURCE}),e.writeTextFile({path:n.workerSource,content:DIAGNOSTICS_WORKER_SOURCE}),...t.vercel===!0?[e.writeTextFile({path:n.vercelWrapper,content:vercelWrapperSource(e)})]:[]]);let r=await e.run({command:toolingInstallCommand(e,t.vercel===!0)});if(r.exitCode!==0)throw Error(`eve-code tooling installation failed (exit ${r.exitCode}): ${commandFailureDetail(r)}`)}function toolingInstallCommand(e,t){let n=toolingPaths(e),quote=e=>`'${e.replaceAll(`'`,`'"'"'`)}'`;return[`set -e`,`mkdir -p ${quote(n.root)}`,`if ! command -v gh >/dev/null 2>&1; then`,`  command -v apt-get >/dev/null 2>&1 || { echo 'eve-code requires gh or apt-get' >&2; exit 1; }`,`  if [ "$(id -u)" = 0 ]; then APT=apt-get; else command -v sudo >/dev/null 2>&1 || { echo 'eve-code needs root or sudo to install gh' >&2; exit 1; }; APT='sudo -n apt-get'; fi`,`  $APT update && $APT install -y gh`,`fi`,`chmod 755 ${quote(n.ghWrapper)} ${quote(n.signedCommit)}`,`if [ "$(id -u)" = 0 ]; then INSTALL=install; else INSTALL='sudo -n install'; fi`,`$INSTALL -d -o root -g root -m 755 ${quote(n.trustedRoot)} ${quote(n.typescriptRoot)}`,`[ -x /usr/bin/gh ] || { echo 'eve-code requires gh at /usr/bin/gh' >&2; exit 1; }`,`$INSTALL -m 755 /usr/bin/gh ${quote(n.ghReal)}`,`$INSTALL -m 755 ${quote(n.signedCommit)} ${quote(n.trustedSignedCommit)}`,`$INSTALL -m 644 ${quote(n.workerSource)} ${quote(n.worker)}`,`$INSTALL -m 755 ${quote(n.ghWrapper)} /usr/local/bin/gh`,`$INSTALL -m 755 ${quote(n.trustedSignedCommit)} /usr/local/bin/gh-signed-commit`,typescriptInstallCommand(e),...t?[`if [ "$(id -u)" = 0 ]; then npm install -g vercel@latest; else sudo -n npm install -g vercel@latest; fi`,`$INSTALL -m 755 ${quote(n.vercelWrapper)} /usr/local/bin/vercel`,`$INSTALL -m 755 ${quote(n.vercelWrapper)} /usr/local/bin/vc`]:[]].join(`
 `)}export{CODE_TOOLING_REVALIDATION_KEY,COMPUTER_USE_REVALIDATION_KEY,authenticateGitHub,authenticateVercel,executeGitHubShell,githubShellApproval,installCodeTooling,installComputerUse,startComputerUse};

package/dist/src/extensions/code/extension/lib/tooling.d.ts

@@ -1,16 +1,16 @@
 import type { SandboxSession } from "eve/sandbox";
-import { GH_SIGNED_COMMIT_SOURCE, GH_SIGNED_COMMIT_VERSION } from "./signed-commit.ts";
+import { GH_SIGNED_COMMIT_SOURCE, GH_SIGNED_COMMIT_VERSION } from "eve/extensions/git/sandbox";
 export { GH_SIGNED_COMMIT_SOURCE, GH_SIGNED_COMMIT_VERSION };
 export declare const TYPESCRIPT_VERSION = "6.0.3";
 export declare function toolingPaths(sandbox: Pick<SandboxSession, "resolvePath">): {
     root: string;
     trustedRoot: string;
     env: string;
-    ghReal: string;
+    ghReal: "/usr/local/lib/eve-code/gh";
     ghWrapper: string;
     vercelWrapper: string;
     signedCommit: string;
-    trustedSignedCommit: string;
+    trustedSignedCommit: "/usr/local/lib/eve-code/gh-signed-commit";
     typescriptRoot: string;
     typescriptModule: string;
     workerSource: string;
@@ -21,7 +21,7 @@ export declare function vercelWrapperSource(sandbox: Pick<SandboxSession, "resol
 export declare function typescriptInstallCommand(sandbox: Pick<SandboxSession, "resolvePath">): string;
 /**
  * Runs inside the sandbox with `node`. Reads one base64 JSON request from
- * `EVE_CODE_DIAGNOSTICS_REQUEST` (`{ repoRoot, filePath }`), loads only the
+ * `EVE_CODE_DIAGNOSTICS_REQUEST` (`{ patchRoot, filePath }`), loads only the
  * bootstrap-installed compiler, and prints `{ diagnostics }`.
  */
 export declare const DIAGNOSTICS_WORKER_SOURCE: string;