@oh-my-pi/pi-coding-agent 16.3.2 → 16.3.4

package/src/edit/hashline/diff.ts

@@ -180,8 +180,7 @@ function resolvePreviewEdits(args: {
 }): readonly Edit[] {
 	const { section, absolutePath, normalized, snapshots, expected, liveMatches, edits } = args;
 	if (!hasBlockEdit(edits)) return edits;
-	const baseText =
-		expected === undefined || liveMatches ? normalized : snapshots.byHashExact(absolutePath, expected)?.text;
+	const baseText = expected === undefined || liveMatches ? normalized : snapshots.byHash(absolutePath, expected)?.text;
 	if (baseText === undefined) {
 		throw createMismatchError(section, absolutePath, normalized, snapshots, expected ?? "");
 	}
@@ -200,17 +199,9 @@ function applyPreviewEdits(args: {
 	if (!options.skipHashValidation && expected === undefined) {
 		throw new Error(missingSnapshotTagMessage(section.path));
 	}
-	// A 16-bit tag can collide across two different file states, so hash
-	// equality alone does not prove the live text IS the snapshot the model's
-	// anchors were minted against (mirrors Patcher's apply-time guard). When
-	// the store retains text for the tag, require it to be unambiguous and
-	// byte-identical to live; otherwise fall through to recovery/reject below
-	// exactly as if the hash had not matched.
-	const liveMatches =
-		expected !== undefined &&
-		computeFileHash(normalized) === expected &&
-		(snapshots.byHash(absolutePath, expected) === null ||
-			snapshots.byHashExact(absolutePath, expected)?.text === normalized);
+	// The 4-hex tag is content-derived: when the live text hashes to it, trust
+	// the match and preview directly (mirrors Patcher's apply-time behavior).
+	const liveMatches = expected !== undefined && computeFileHash(normalized) === expected;
 	const edits = parsePreviewEdits(section, options.streaming);
 	const resolved = resolvePreviewEdits({ section, absolutePath, normalized, snapshots, expected, liveMatches, edits });
 	if (options.skipHashValidation || expected === undefined || liveMatches) return applyEdits(normalized, resolved);

package/src/edit/hashline/execute.ts

@@ -1,6 +1,6 @@
 /**
  * Coding-agent runner that drives the hashline {@link Patcher} on behalf of
- * the `edit` tool. Converts a `{input}` tool-call payload into a
+ * the `edit` tool. Converts an `{input}` tool-call payload into a
  * fully-applied patch, wraps the result in the agent's
  * {@link AgentToolResult} shape, and attaches LSP diagnostics + `outputMeta`
  * for the renderer.

package/src/edit/hashline/params.ts

@@ -1,19 +1,12 @@
 /**
  * Arktype schema for the `edit` tool's hashline mode payload. The schema is
  * deliberately permissive (allows extra keys) so providers can attach extra
- * keys without rejection; only `input` is required. `_input` is accepted as a
- * provider-emitted alias for `input`.
+ * keys without rejection; only `input` is required.
  */
 import { type } from "arktype";
 
-const requiredInputSchema = type({ input: "string" });
-const inputAliasSchema = type({ "input?": "string", "_input?": "string" });
+export const hashlineEditParamsSchema = type({
+	input: "string",
+});
 
-export const hashlineEditParamsSchema = inputAliasSchema
-	.pipe(raw => {
-		if (raw.input !== undefined || raw._input === undefined) return raw;
-		return { ...raw, input: raw._input };
-	})
-	.pipe(requiredInputSchema);
-
-export type HashlineParams = Parameters<typeof hashlineEditParamsSchema.assert>[0];
+export type HashlineParams = typeof hashlineEditParamsSchema.infer;

package/src/edit/renderer.ts

@@ -114,6 +114,7 @@ interface EditRenderArgs {
 	newText?: string;
 	patch?: string;
 	input?: string;
+	_input?: string;
 	all?: boolean;
 	// Patch mode fields
 	op?: Operation;
@@ -600,10 +601,11 @@ function getHashlineInputRenderSummary(
 	args: EditRenderArgs,
 	editMode: EditMode | undefined,
 ): HashlineInputRenderSummary | undefined {
-	if (editMode !== "hashline" || typeof args.input !== "string") {
+	const input = args.input ?? args._input;
+	if (editMode !== "hashline" || typeof input !== "string") {
 		return undefined;
 	}
-	return { entries: getHashlineInputSections(args.input) };
+	return { entries: getHashlineInputSections(input) };
 }
 
 function getApplyPatchRenderSummary(

package/src/edit/streaming.ts

@@ -429,9 +429,19 @@ const patchStrategy: EditStreamingStrategy<PatchArgs> = {
 
 interface HashlineArgs {
 	input?: string;
+	_input?: string;
 	__partialJson?: string;
 }
 
+/**
+ * Text payload of a hashline edit call. The public schema declares `input`, but
+ * streaming sees the raw model output before validation coerces aliases, so a
+ * provider that emits the legacy `_input` key still previews correctly.
+ */
+function hashlineEditText(args: HashlineArgs | undefined): string | undefined {
+	return args?.input ?? args?._input;
+}
+
 /**
  * While streaming a free-form text payload (apply_patch envelope, hashline
  * input), trim the trailing partial line so per-character growth of an
@@ -513,7 +523,8 @@ const hashlineStrategy: EditStreamingStrategy<HashlineArgs> = {
 		return args;
 	},
 	async computeDiffPreview(args, ctx) {
-		if (typeof args.input !== "string" || args.input.length === 0) return null;
+		const input = hashlineEditText(args);
+		if (typeof input !== "string" || input.length === 0) return null;
 		// Unlike apply_patch, hashline previews flow through `applyPartialTo`,
 		// whose streaming-tolerant parser (`parsePatchStreaming` → `endStreaming`)
 		// drops a payload-less trailing op and projects a partially-typed payload
@@ -521,7 +532,6 @@ const hashlineStrategy: EditStreamingStrategy<HashlineArgs> = {
 		// would instead strip the sole payload of a single-op `replace`/`insert`
 		// for almost the entire stream, collapsing the preview to "No changes" and
 		// rendering a blank box. Feed the raw in-flight text straight through.
-		const input = args.input;
 		ctx.signal.throwIfAborted();
 
 		let sections: readonly HashlineInputSection[];
@@ -579,19 +589,19 @@ const hashlineStrategy: EditStreamingStrategy<HashlineArgs> = {
 		return "";
 	},
 	matcherDigest(args) {
-		const input = args?.input;
+		const input = hashlineEditText(args);
 		if (typeof input !== "string") return undefined;
 		// Body rows are `+TEXT`; headers and op lines are grammar, never content.
 		return extractAddedLines(input, false);
 	},
 	matcherPaths(args) {
-		const input = args?.input;
+		const input = hashlineEditText(args);
 		if (typeof input !== "string" || input.length === 0) return undefined;
 		const paths = extractHashlineHeaderPaths(input);
 		return paths.length > 0 ? paths : undefined;
 	},
 	matcherEntries(args) {
-		const input = args?.input;
+		const input = hashlineEditText(args);
 		if (typeof input !== "string" || input.length === 0) return undefined;
 		const entries = splitHashlinePerFile(input);
 		return entries.length > 0 ? entries : undefined;

package/src/export/html/tool-views.generated.js

@@ -17,9 +17,9 @@ Error generating stack: `+X.message+`
 `),maxLines:6,title:N>D.length?`parse issues (${N} total)`:"parse issues"}),W0.jsx(S,{result:Y,maxLines:12})]})}var HH={Summary:jq,Body:xq};var K0=K($(),1),yq=/^[\w@%+=:,./-]+$/,gq=/\[raw output: artifact:\/\/([\w-]+)\]/;function mq(f){let Y=[];for(let Z in f){let X=$Z(f[Z]);Y.push(`${Z}=${yq.test(X)?X:JSON.stringify(X)}`)}return Y.join(" ")}function uq(f){if(!f||!T(f.async))return null;let Y=A(f.async.state);return Y?{state:Y,jobId:A(f.async.jobId)}:null}function cq({args:f,result:Y}){let Z=f.command===void 0?"…":A(f.command);if(Z===null)return K0.jsx(v,{what:"command"});let X=I(b(Z)||"…",80);return Y?.isError?K0.jsx("span",{className:"tv-err-text",children:X}):K0.jsx("span",{children:X})}function dq({args:f,result:Y}){let Z=f.command===void 0?"…":A(f.command),X=T(f.env)?mq(f.env):"",G=A(f.cwd),z=O(f.head),J=O(f.tail),U=P(Y),H=O(U?.exitCode),W=O(U?.wallTimeMs),Q=O(f.timeout)??O(U?.timeoutSeconds),_=O(U?.requestedTimeoutSeconds),q=uq(U),M=gq.exec(o0(Y))?.[1]??null,D=[];if(W!==null)D.push(W<1000?`wall ${Math.round(W)}ms`:`wall ${(W/1000).toFixed(1)}s`);if(_!==null&&_!==Q)D.push(`requested timeout ${_}s clamped`);if(q?.jobId)D.push(`job ${q.jobId}`);if(M)D.push(`artifact ${M}`);return K0.jsxs(K0.Fragment,{children:[K0.jsxs("div",{className:"tv-cmd",children:[K0.jsx("span",{className:"tv-cmd-prompt",children:"$"}),K0.jsxs("span",{className:"tv-cmd-text",children:[X&&K0.jsx("span",{className:"tv-cmd-env",children:`${X} `}),Z??K0.jsx(v,{what:"command"})]})]}),K0.jsx(o,{items:[G&&K0.jsxs(w,{children:["cwd=",V0(G)]}),Q!==null&&K0.jsxs(w,{children:["timeout=",Q,"s"]}),f.pty===!0&&K0.jsx(w,{tone:"accent",children:"pty"}),!q&&f.async===!0&&K0.jsx(w,{tone:"accent",children:"async"}),z!==null&&K0.jsxs(w,{children:["head=",z]}),J!==null&&K0.jsxs(w,{children:["tail=",J]}),H!==null&&K0.jsxs(w,{tone:"err",children:["exit ",H]}),q&&K0.jsxs(w,{tone:q.state==="failed"?"err":q.state==="running"?"accent":"ok",children:["async ",q.state]})]}),K0.jsx(q7,{result:Y}),K0.jsx(S,{result:Y,maxLines:12}),D.length>0&&K0.jsx(m,{children:D.join(" · ")})]})}var AH={Summary:cq,Body:dq};var v0=K($(),1);function WH(f){let Y=P(f);return{action:Y?A(Y.action):null,name:Y?A(Y.name):null,url:Y?A(Y.url):null,browser:Y?A(Y.browser):null}}function lq(f){if(!T(f.app))return null;return{path:A(f.app.path),cdpUrl:A(f.app.cdp_url),target:A(f.app.target)}}function pq(f){switch(f){case"open":return"ok";case"run":return"accent";case"close":return"warn";default:return}}function iq(f,Y){if(f?.cdpUrl)return`connected ${f.cdpUrl}`;if(f?.path)return`spawned ${V0(f.path)}`;return Y.browser}function oq({args:f,result:Y}){let Z=WH(Y),X=A(f.action)??Z.action??"?",G=X==="close"&&(f.all===!0||A(f.name)===null&&Z.name===null),z=Z.name??A(f.name)??"main",J=Z.url??A(f.url);return v0.jsxs(v0.Fragment,{children:[v0.jsx(w,{tone:pq(X),children:X}),v0.jsx("span",{children:G?"all tabs":z}),f.kill===!0&&v0.jsx(w,{tone:"err",children:"kill"}),J&&v0.jsx("span",{className:"tv-faint",children:I(V0(J),72)})]})}function nq({args:f,result:Y}){let Z=WH(Y),X=A(f.action)??Z.action,G=lq(f),z=Z.name??A(f.name),J=Z.url??A(f.url),U=iq(G,Z),H=T(f.viewport)?f.viewport:null,W=H?O(H.width):null,Q=H?O(H.height):null,_=H?O(H.scale):null,q=A(f.code);return v0.jsxs(v0.Fragment,{children:[v0.jsxs("span",{className:"tv-badges",children:[z!==null&&v0.jsxs(w,{children:["tab ",z]}),J&&v0.jsx(w,{tone:"accent",children:I(V0(J),120)}),U&&v0.jsx(w,{children:U}),G?.target&&v0.jsxs(w,{children:["target ",G.target]}),f.all===!0&&v0.jsx(w,{tone:"warn",children:"all"}),f.kill===!0&&v0.jsx(w,{tone:"err",children:"kill"}),W!==null&&Q!==null&&v0.jsxs(w,{children:[W,"×",Q,_!==null?`@${_}x`:""]})]}),X==="run"&&q!==null&&v0.jsx(O7,{code:q.replace(/\s+$/,""),lang:"javascript"}),v0.jsx(q7,{result:Y}),v0.jsx(S,{result:Y,maxLines:10})]})}var f8={Summary:oq,Body:nq};var G0=K($(),1);function rq(f){let Y=P(f);if(!Y||!T(Y.snapshot))return null;let Z=Y.snapshot,X=T(Z.source)?Z.source:null;return{id:A(Z.id)??(O(Z.id)!==null?String(Z.id):null),adapter:A(Z.adapter),status:A(Z.status),program:A(Z.program),stopReason:A(Z.stopReason),frameName:A(Z.frameName),sourcePath:X?A(X.path):null,line:O(Z.line),column:O(Z.column),exitCode:O(Z.exitCode),needsConfigurationDone:Z.needsConfigurationDone===!0}}function aq(f){let Y=A(f.args.action)??A(P(f.result)?.action);return Y?Y.replace(/_/g," "):"request"}function sq(f){return A(f.function)??A(f.expression)??A(f.command)??A(f.memory_reference)??A(f.instruction_reference)??A(f.data_id)??A(f.name)}function tq(f){let{args:Y}=f,Z=A(Y.program),X=A(Y.file),G=O(Y.line),z=sq(Y);return G0.jsxs(G0.Fragment,{children:[G0.jsx(w,{tone:"accent",children:aq(f)}),Z!==null?G0.jsx(Y0,{path:Z}):X!==null?G0.jsx(Y0,{path:X,from:G??void 0}):z!==null?G0.jsx("span",{children:I(b(z),80)}):null]})}var eq=[["adapter","adapter"],["cwd","cwd"],["function","function"],["name","name"],["condition","condition"],["hit_condition","hit condition"],["context","context"],["frame_id","frame id"],["scope_id","scope id"],["variable_ref","variable ref"],["pid","pid"],["host","host"],["port","port"],["levels","levels"],["memory_reference","memory ref"],["instruction_reference","instruction ref"],["instruction_count","instruction count"],["instruction_offset","instruction offset"],["offset","offset"],["count","count"],["data","data"],["data_id","data id"],["access_type","access"],["command","command"],["resolve_symbols","resolve symbols"],["allow_partial","allow partial"],["start_module","start module"],["module_count","module count"],["timeout","timeout"]];function fQ(f){let{args:Y,result:Z}=f,X=A(Y.program),G=A(Y.file),z=O(Y.line),J=A(Y.expression),U=Array.isArray(Y.args)?Y.args.filter((_)=>typeof _==="string"):[],H=[];if(X!==null)H.push(G0.jsx(E,{k:"program",children:G0.jsx(Y0,{path:X})},"program"));if(U.length>0)H.push(G0.jsx(E,{k:"args",children:I(U.join(" "),160)},"args"));if(G!==null)H.push(G0.jsx(E,{k:"file",children:G0.jsx(Y0,{path:G,from:z??void 0})},"file"));else if(z!==null)H.push(G0.jsx(E,{k:"line",children:z},"line"));for(let[_,q]of eq){let M=Y[_];if(typeof M!=="string"&&typeof M!=="number"&&typeof M!=="boolean")continue;H.push(G0.jsx(E,{k:q,children:I($Z(M),120)},_))}let W="";if(T(Y.arguments))try{W=JSON.stringify(Y.arguments,null,2)??""}catch{W=""}let Q=rq(Z);return G0.jsxs(G0.Fragment,{children:[H.length>0&&G0.jsx(O0,{children:H}),J!==null&&G0.jsx(O7,{code:J,title:"expression",maxLines:8}),W&&G0.jsx(O7,{code:W,lang:"json",title:"arguments",maxLines:10}),Q&&G0.jsxs(O0,{children:[Q.id!==null&&G0.jsx(E,{k:"session",children:Q.id}),Q.adapter!==null&&G0.jsx(E,{k:"adapter",children:Q.adapter}),Q.status!==null&&G0.jsx(E,{k:"status",children:G0.jsx(w,{tone:Q.status==="exited"?"warn":"ok",children:Q.status})}),Q.program!==null&&G0.jsx(E,{k:"program",children:G0.jsx(Y0,{path:Q.program})}),Q.stopReason!==null&&G0.jsx(E,{k:"stop reason",children:Q.stopReason}),Q.frameName!==null&&G0.jsx(E,{k:"frame",children:Q.frameName}),Q.sourcePath!==null&&Q.line!==null&&G0.jsx(E,{k:"location",children:G0.jsx(Y0,{path:Q.sourcePath,sel:Q.column!==null?`${Q.line}:${Q.column}`:String(Q.line)})}),Q.exitCode!==null&&G0.jsx(E,{k:"exit code",children:Q.exitCode}),Q.needsConfigurationDone&&G0.jsx(E,{k:"configuration",children:"pending configurationDone — set breakpoints, then continue"})]}),G0.jsx(S,{result:Z,maxLines:10})]})}var qH={Summary:tq,Body:fQ};var y=K($(),1);function YQ(f){let Y=f.trimEnd();if(!Y.startsWith("[")||!Y.endsWith("]"))return null;let Z=Y.slice(1,-1).trim(),X=/#[0-9a-fA-F]{4}$/.exec(Z);if(X)Z=Z.slice(0,X.index);if(Z.length>=2){let G=Z[0];if((G==='"'||G==="'")&&G===Z[Z.length-1])Z=Z.slice(1,-1)}return Z.length>0?Z:null}var ZQ=/^\*{3} (?:Update|Add|Delete) File:\s*(.+)$/;function RH(f){let Y=f.startsWith("\uFEFF")?f.slice(1):f,Z=[];for(let X of Y.split(`
 `)){let G=X.replace(/\r$/,""),z=YQ(G);if(z){Z.push(z);continue}let J=ZQ.exec(G.trim());if(J)Z.push(J[1].trim())}return Z}var XQ=/^(?:replace|insert|delete)\b/;function GQ(f){let Y=0;for(let Z of f.split(`
 `))if(XQ.test(Z))Y++;return Y}function zQ(f){let Y=0,Z=0;for(let X of f.split(`
-`))if(X.startsWith("+"))Y++;else if(X.startsWith("-"))Z++;return{added:Y,removed:Z}}function QH(f){let Y=T(f.diagnostics)?f.diagnostics:null,Z=[];if(Y&&Array.isArray(Y.messages)){for(let X of Y.messages)if(typeof X==="string")Z.push(X)}return{path:A(f.path),diff:A(f.diff),firstChangedLine:O(f.firstChangedLine),op:A(f.op),move:A(f.move),isError:f.isError===!0,errorText:A(f.displayErrorText)??A(f.errorText),diagnostics:Y?{summary:A(Y.summary),messages:Z,errored:Y.errored===!0}:null}}function JQ({args:f,result:Y}){let Z=A(f.input),X=Z?RH(Z):[],G=A(f.file_path)??A(f.path);if(X.length===0&&G)X.push(G);if(X.length===0&&Array.isArray(f.edits))for(let Q of f.edits){let _=T(Q)?A(Q.path):null;if(_&&!X.includes(_))X.push(_)}let z=Z?GQ(Z):0,J=P(Y),U=J&&Y?.isError!==!0?A(J.diff):null,H=U?zQ(U):null,W=Z?I(b(Z.split(`
+`))if(X.startsWith("+"))Y++;else if(X.startsWith("-"))Z++;return{added:Y,removed:Z}}function QH(f){let Y=T(f.diagnostics)?f.diagnostics:null,Z=[];if(Y&&Array.isArray(Y.messages)){for(let X of Y.messages)if(typeof X==="string")Z.push(X)}return{path:A(f.path),diff:A(f.diff),firstChangedLine:O(f.firstChangedLine),op:A(f.op),move:A(f.move),isError:f.isError===!0,errorText:A(f.displayErrorText)??A(f.errorText),diagnostics:Y?{summary:A(Y.summary),messages:Z,errored:Y.errored===!0}:null}}function JQ({args:f,result:Y}){let Z=A(f.input)??A(f._input),X=Z?RH(Z):[],G=A(f.file_path)??A(f.path);if(X.length===0&&G)X.push(G);if(X.length===0&&Array.isArray(f.edits))for(let Q of f.edits){let _=T(Q)?A(Q.path):null;if(_&&!X.includes(_))X.push(_)}let z=Z?GQ(Z):0,J=P(Y),U=J&&Y?.isError!==!0?A(J.diff):null,H=U?zQ(U):null,W=Z?I(b(Z.split(`
 `,1)[0]??""),80):"";return y.jsxs(y.Fragment,{children:[X.length>0?y.jsx(Y0,{path:X[0]}):y.jsx("span",{children:W}),X.length>1&&y.jsxs(y.Fragment,{children:[" ",y.jsxs(w,{children:["+",X.length-1," more"]})]}),z>0&&y.jsxs(y.Fragment,{children:[" ",y.jsxs(w,{children:[z," op",z===1?"":"s"]})]}),H!==null&&H.added>0&&y.jsxs(y.Fragment,{children:[" ",y.jsxs(w,{tone:"ok",children:["+",H.added]})]}),H!==null&&H.removed>0&&y.jsxs(y.Fragment,{children:[" ",y.jsxs(w,{tone:"err",children:["−",H.removed]})]}),Y?.isError===!0&&y.jsxs(y.Fragment,{children:[" ",y.jsx(w,{tone:"err",children:"failed"})]})]})}function MH({entry:f,fallbackPath:Y}){let Z=f.path??Y??null,X=f.op==="create"||f.op==="delete"?f.op:null,G=f.diagnostics;return y.jsxs("div",{children:[(Z!==null||X!==null||f.move!==null)&&y.jsx("div",{className:"tv-row",children:y.jsxs("span",{className:"tv-row-val",children:[Z!==null&&y.jsx(Y0,{path:Z,from:f.isError?null:f.firstChangedLine}),f.move!==null&&y.jsxs(y.Fragment,{children:[" → ",y.jsx(Y0,{path:f.move})]}),X!==null&&y.jsxs(y.Fragment,{children:[" ",y.jsx(w,{tone:X==="delete"?"err":"ok",children:X})]}),f.isError&&y.jsxs(y.Fragment,{children:[" ",y.jsx(w,{tone:"err",children:"failed"})]})]})}),f.isError?f.errorText!==null&&y.jsx(n,{text:f.errorText,error:!0,maxLines:10}):f.diff!==null&&f.diff.length>0&&y.jsx(AX,{diff:f.diff,maxLines:40}),G?.summary&&y.jsx(p,{tone:G.errored?"err":"warn",children:G.summary}),G!==null&&G.messages.length>0&&y.jsx(n,{text:G.messages.join(`
-`),maxLines:6})]})}function UQ({args:f,result:Y}){let Z=A(f.input),X=P(Y),G=[];if(X&&Array.isArray(X.perFileResults)){for(let U of X.perFileResults)if(T(U))G.push(QH(U))}let z=A(f.file_path)??A(f.path)??(Z?RH(Z)[0]??null:null),J;if(G.length>0)J=G.map((U,H)=>y.jsx(MH,{entry:U},`${U.path??""}:${H}`));else if(Y?.isError===!0)J=y.jsx(S,{result:Y,maxLines:15});else if(X){let U=QH(X);J=U.diff!==null||U.diagnostics!==null||U.move!==null?y.jsx(MH,{entry:U,fallbackPath:z}):y.jsx(S,{result:Y,maxLines:8})}else J=y.jsx(S,{result:Y,maxLines:8});return y.jsxs(y.Fragment,{children:[J,Array.isArray(f.edits)&&f.edits.length>0&&y.jsx(O0,{children:f.edits.map((U,H)=>T(U)?y.jsx(E,{k:A(U.op)??"edit",children:A(U.sel)??A(U.path)??A(U.rename)??A(U.move)??"?"},`${H}`):y.jsx(E,{k:"edit",children:y.jsx(v,{what:"edit"})},`${H}`))}),Z!==null&&Z.length>0&&y.jsx(n,{text:Z,variant:"code",maxLines:10,title:"input"}),Z===null&&f.input!==void 0&&y.jsx(v,{what:"input"})]})}var Y8={Summary:JQ,Body:UQ};var C0=K($(),1),HQ={py:"python",js:"javascript",ts:"typescript",rb:"ruby",jl:"julia"};function VY(f){let Y=(f??"").toUpperCase();if(Y==="PY"||Y==="PYTHON"||Y==="IPY"||Y==="IPYTHON")return"py";if(Y==="JS"||Y==="JAVASCRIPT")return"js";if(Y==="TS"||Y==="TYPESCRIPT")return"ts";if(Y==="RB"||Y==="RUBY")return"rb";if(Y==="JL"||Y==="JULIA")return"jl";return null}function AQ(f){let Y=[],Z=0;while(Z<f.length){while(Z<f.length&&/\s/.test(f[Z]))Z++;if(Z>=f.length)break;let X="";while(Z<f.length&&!/\s/.test(f[Z])){let G=f[Z];if(G==='"'||G==="'"){X+=G,Z++;while(Z<f.length&&f[Z]!==G)X+=f[Z],Z++;if(Z<f.length)X+=f[Z],Z++}else X+=G,Z++}Y.push(X)}return Y}function WQ(f){let Y=/^\*{2,}\s*Cell\b\s*(.*)$/i,Z=/^\*{2,}\s*End\b.*$/i,X=/^([a-zA-Z][\w-]*)(?::(?:"([^"]*)"|'([^']*)'|(.*)))?$/,G=/^\d+(?:ms|s|m)?$/,z=["id","title","name","cell","file","label"],J=["t","timeout","duration","time"],U=["rst","reset"],H=f.split(`
+`),maxLines:6})]})}function UQ({args:f,result:Y}){let Z=A(f.input)??A(f._input),X=P(Y),G=[];if(X&&Array.isArray(X.perFileResults)){for(let U of X.perFileResults)if(T(U))G.push(QH(U))}let z=A(f.file_path)??A(f.path)??(Z?RH(Z)[0]??null:null),J;if(G.length>0)J=G.map((U,H)=>y.jsx(MH,{entry:U},`${U.path??""}:${H}`));else if(Y?.isError===!0)J=y.jsx(S,{result:Y,maxLines:15});else if(X){let U=QH(X);J=U.diff!==null||U.diagnostics!==null||U.move!==null?y.jsx(MH,{entry:U,fallbackPath:z}):y.jsx(S,{result:Y,maxLines:8})}else J=y.jsx(S,{result:Y,maxLines:8});return y.jsxs(y.Fragment,{children:[J,Array.isArray(f.edits)&&f.edits.length>0&&y.jsx(O0,{children:f.edits.map((U,H)=>T(U)?y.jsx(E,{k:A(U.op)??"edit",children:A(U.sel)??A(U.path)??A(U.rename)??A(U.move)??"?"},`${H}`):y.jsx(E,{k:"edit",children:y.jsx(v,{what:"edit"})},`${H}`))}),Z!==null&&Z.length>0&&y.jsx(n,{text:Z,variant:"code",maxLines:10,title:"input"}),Z===null&&(f.input!==void 0||f._input!==void 0)&&y.jsx(v,{what:"input"})]})}var Y8={Summary:JQ,Body:UQ};var C0=K($(),1),HQ={py:"python",js:"javascript",ts:"typescript",rb:"ruby",jl:"julia"};function VY(f){let Y=(f??"").toUpperCase();if(Y==="PY"||Y==="PYTHON"||Y==="IPY"||Y==="IPYTHON")return"py";if(Y==="JS"||Y==="JAVASCRIPT")return"js";if(Y==="TS"||Y==="TYPESCRIPT")return"ts";if(Y==="RB"||Y==="RUBY")return"rb";if(Y==="JL"||Y==="JULIA")return"jl";return null}function AQ(f){let Y=[],Z=0;while(Z<f.length){while(Z<f.length&&/\s/.test(f[Z]))Z++;if(Z>=f.length)break;let X="";while(Z<f.length&&!/\s/.test(f[Z])){let G=f[Z];if(G==='"'||G==="'"){X+=G,Z++;while(Z<f.length&&f[Z]!==G)X+=f[Z],Z++;if(Z<f.length)X+=f[Z],Z++}else X+=G,Z++}Y.push(X)}return Y}function WQ(f){let Y=/^\*{2,}\s*Cell\b\s*(.*)$/i,Z=/^\*{2,}\s*End\b.*$/i,X=/^([a-zA-Z][\w-]*)(?::(?:"([^"]*)"|'([^']*)'|(.*)))?$/,G=/^\d+(?:ms|s|m)?$/,z=["id","title","name","cell","file","label"],J=["t","timeout","duration","time"],U=["rst","reset"],H=f.split(`
 `);if(H.length>0&&H[H.length-1]==="")H.pop();let W=[],Q=0;while(Q<H.length&&H[Q].trim()==="")Q++;while(Q<H.length){let _=Y.exec(H[Q]);if(!_){Q++;continue}let q=AQ(_[1]??""),M=null,D="",N=[],u=!1,B=[];for(let L of q){if(U.includes(L.toLowerCase())){u=!0;continue}let V=X.exec(L);if(V&&L.includes(":")){let r=V[1].toLowerCase(),C=V[2]??V[3]??V[4]??"",d=VY(r);if(d){if(!M)M=d;if(!D&&C)D=C;continue}if(z.includes(r)){if(!D)D=C;continue}if(J.includes(r)){N.push(`t=${C}`);continue}if(U.includes(r))N.push("rst");continue}let h=VY(L);if(h&&!M){M=h;continue}if(G.test(L)){N.push(`t=${L}`);continue}B.push(L)}if(!D&&B.length>0)D=B.join(" ");if(u)N.push("rst");Q++;let R=[];while(Q<H.length){if(Z.test(H[Q])){Q++;break}if(Y.test(H[Q]))break;R.push(H[Q]),Q++}while(R.length>0&&R[R.length-1].trim()==="")R.pop();W.push({lang:M??"py",title:D,attrs:N,code:R.join(`
 `)});while(Q<H.length&&H[Q].trim()==="")Q++}return W}function qQ(f){let Y=/^\*{2,}\s*Begin\b\s*(\S+)?\s*$/i,Z=/^\*{2,}\s*End\b.*$/i,X=/^\*{2,}\s*Title\s*:\s*(.+?)\s*$/i,G=/^\*{2,}\s*Timeout\s*:\s*(\S+)\s*$/i,z=/^\*{2,}\s*Reset\s*$/i,J=f.split(`
 `);if(J.length>0&&J[J.length-1]==="")J.pop();let U=[],H=0;while(H<J.length&&J[H].trim()==="")H++;while(H<J.length){let W=Y.exec(J[H]);if(!W){H++;continue}let Q=VY(W[1])??"py";H++;let _="",q=[];while(H<J.length){let D=X.exec(J[H]);if(D){if(!_)_=D[1];H++;continue}let N=G.exec(J[H]);if(N){q.push(`t=${N[1]}`),H++;continue}if(z.test(J[H])){q.push("rst"),H++;continue}break}let M=[];while(H<J.length){if(Z.test(J[H])){H++;break}if(Y.test(J[H]))break;M.push(J[H]),H++}while(M.length>0&&M[M.length-1].trim()==="")M.pop();U.push({lang:Q,title:_,attrs:q,code:M.join(`

package/src/extensibility/plugins/installer.ts

@@ -53,9 +53,14 @@ export async function installPlugin(packageName: string): Promise<InstalledPlugi
 		windowsHide: true,
 	});
 
-	const exitCode = await proc.exited;
+	// Drain both pipes concurrently with proc.exited to avoid a pipe-buffer
+	// deadlock if bun install floods stdout/stderr.
+	const [exitCode, , stderr] = await Promise.all([
+		proc.exited,
+		new Response(proc.stdout).text(),
+		new Response(proc.stderr).text(),
+	]);
 	if (exitCode !== 0) {
-		const stderr = await new Response(proc.stderr).text();
 		throw new Error(`Failed to install ${packageName}: ${stderr}`);
 	}
 
@@ -95,7 +100,11 @@ export async function uninstallPlugin(name: string): Promise<void> {
 		windowsHide: true,
 	});
 
-	const exitCode = await proc.exited;
+	const [exitCode] = await Promise.all([
+		proc.exited,
+		new Response(proc.stdout).text(),
+		new Response(proc.stderr).text(),
+	]);
 	if (exitCode !== 0) {
 		throw new Error(`Failed to uninstall ${name}`);
 	}

package/src/extensibility/plugins/manager.ts

@@ -458,10 +458,17 @@ export class PluginManager {
 				stderr: "pipe",
 				windowsHide: true,
 			});
-			const installExit = await installProc.exited;
+			// Drain stdout+stderr concurrently with proc.exited. Awaiting exited
+			// before reading either pipe risks a >64 KiB OS-pipe-buffer deadlock
+			// once bun install prints enough progress; even where Bun currently
+			// buffers eagerly, doing this leaks unbounded memory.
+			const [installExit, , installStderr] = await Promise.all([
+				installProc.exited,
+				new Response(installProc.stdout).text(),
+				new Response(installProc.stderr).text(),
+			]);
 			if (installExit !== 0) {
-				const stderr = await new Response(installProc.stderr).text();
-				throw new Error(`bun install failed: ${stderr}`);
+				throw new Error(`bun install failed: ${installStderr}`);
 			}
 			// Resolve actual package name. npm specs encode the name (strip version);
 			// git specs do not, so diff plugins/package.json deps to find the new entry.
@@ -508,10 +515,14 @@ export class PluginManager {
 					stderr: "pipe",
 					windowsHide: true,
 				});
-				const updateExit = await updateProc.exited;
+				// Same drain-concurrent-with-exit pattern as the bun install above.
+				const [updateExit, , updateStderr] = await Promise.all([
+					updateProc.exited,
+					new Response(updateProc.stdout).text(),
+					new Response(updateProc.stderr).text(),
+				]);
 				if (updateExit !== 0) {
-					const stderr = await new Response(updateProc.stderr).text();
-					throw new Error(`bun update ${actualName} failed: ${stderr}`);
+					throw new Error(`bun update ${actualName} failed: ${updateStderr}`);
 				}
 			}
 
@@ -608,7 +619,13 @@ export class PluginManager {
 			windowsHide: true,
 		});
 
-		const exitCode = await proc.exited;
+		// Drain both pipes concurrently with proc.exited to avoid a pipe-buffer
+		// deadlock if bun uninstall floods stdout/stderr.
+		const [exitCode] = await Promise.all([
+			proc.exited,
+			new Response(proc.stdout).text(),
+			new Response(proc.stderr).text(),
+		]);
 		if (exitCode !== 0) {
 			throw new Error(`npm uninstall failed for ${name}`);
 		}
@@ -1007,7 +1024,14 @@ export class PluginManager {
 				stderr: "pipe",
 				windowsHide: true,
 			});
-			return (await proc.exited) === 0;
+			// Drain pipes concurrently with proc.exited; otherwise a chatty
+			// bun install can block on a full OS pipe buffer.
+			const [exit] = await Promise.all([
+				proc.exited,
+				new Response(proc.stdout).text(),
+				new Response(proc.stderr).text(),
+			]);
+			return exit === 0;
 		} catch {
 			return false;
 		}

package/src/extensibility/plugins/parser.ts

@@ -86,20 +86,22 @@ export function formatPluginSpec(spec: ParsedPluginSpec): string {
 }
 
 /**
- * Extract the base package name without version specifier.
+ * Extract the dependency key from an npm package specifier.
  * Used for path lookups after npm install.
  *
  * @example
  * extractPackageName("lodash@4.17.21") // "lodash"
  * extractPackageName("@scope/pkg@1.0.0") // "@scope/pkg"
  * extractPackageName("@scope/pkg") // "@scope/pkg"
+ * extractPackageName("npm:lodash") // "lodash"
  */
 export function extractPackageName(specifier: string): string {
+	const npmSpecifier = specifier.replace(/^npm:/i, "");
 	// Handle scoped packages: @scope/name@version -> @scope/name
-	if (specifier.startsWith("@")) {
-		const match = specifier.match(/^(@[^/]+\/[^@]+)/);
-		return match ? match[1] : specifier;
+	if (npmSpecifier.startsWith("@")) {
+		const match = npmSpecifier.match(/^(@[^/]+\/[^@]+)/);
+		return match ? match[1] : npmSpecifier;
 	}
 	// Unscoped: name@version -> name
-	return specifier.replace(/@[^@]+$/, "");
+	return npmSpecifier.replace(/@[^@]+$/, "");
 }

package/src/extensibility/tool-event-input.ts

@@ -60,7 +60,7 @@ export function normalizeToolEventInput(toolName: string, input: Record<string,
 	if (toolName !== "edit" || stringField(input, "path")) return input;
 
 	// Hashline edit mode: the only authoritative target list is the parsed
-	// `¶PATH#TAG` headers inside `input`/`_input`. Trusting a passthrough
+	// `¶PATH#TAG` headers inside the patch. Trusting a passthrough
 	// `_path` here would let a model-supplied field override the real edit
 	// target and bypass extension gates that allowlist by path.
 	const rawInput = stringField(input, "input") ?? stringField(input, "_input");

package/src/hindsight/client.test.ts

@@ -0,0 +1,33 @@
+import { afterEach, describe, expect, it, vi } from "bun:test";
+import { HindsightApi } from "./client";
+
+type FetchInput = string | URL | Request;
+type FetchInit = RequestInit | BunFetchRequestInit;
+
+describe("HindsightApi fetch cancellation", () => {
+	afterEach(() => {
+		vi.restoreAllMocks();
+	});
+
+	it("combines caller cancellation with the request timeout", async () => {
+		let requestSignal: AbortSignal | undefined;
+		const fetchStub = Object.assign(
+			async (_input: FetchInput, init?: FetchInit) => {
+				requestSignal = init?.signal ?? undefined;
+				return Response.json({ results: [] });
+			},
+			{ preconnect: globalThis.fetch.preconnect },
+		);
+		vi.spyOn(globalThis, "fetch").mockImplementation(fetchStub);
+
+		const caller = new AbortController();
+		const client = new HindsightApi({ baseUrl: "https://hindsight.example" });
+		await client.recall("bank", "query", { signal: caller.signal });
+
+		expect(requestSignal).toBeInstanceOf(AbortSignal);
+		expect(requestSignal).not.toBe(caller.signal);
+		caller.abort(new Error("caller aborted"));
+		expect(requestSignal?.aborted).toBe(true);
+		expect(requestSignal?.reason).toBe(caller.signal.reason);
+	});
+});

package/src/hindsight/client.ts

@@ -8,10 +8,12 @@
  * tests to spy on.
  */
 
+import { isTimeoutError, withTimeoutSignal } from "../utils/fetch-timeout";
 import type { HindsightConfig } from "./config";
 
 const USER_AGENT = "oh-my-pi-coding-agent";
 const DEFAULT_USER_AGENT = USER_AGENT;
+const HINDSIGHT_REQUEST_TIMEOUT_MS = 30_000;
 
 export type Budget = "low" | "mid" | "high" | string;
 export type TagsMatch = "any" | "all" | "any_strict" | "all_strict";
@@ -24,6 +26,11 @@ export interface HindsightApiOptions {
 	userAgent?: string;
 }
 
+/** Caller cancellation shared by Hindsight request option bags. */
+export interface HindsightRequestOptions {
+	signal?: AbortSignal;
+}
+
 export interface RecallResult {
 	id?: string;
 	text: string;
@@ -77,7 +84,7 @@ export interface MemoryItemInput {
 	updateMode?: UpdateMode;
 }
 
-export interface RetainOptions {
+export interface RetainOptions extends HindsightRequestOptions {
 	timestamp?: Date | string;
 	context?: string;
 	metadata?: Record<string, string>;
@@ -87,7 +94,7 @@ export interface RetainOptions {
 	updateMode?: UpdateMode;
 }
 
-export interface RetainBatchOptions {
+export interface RetainBatchOptions extends HindsightRequestOptions {
 	/** Document id applied to every item that doesn't carry its own. */
 	documentId?: string;
 	/** Tags attached to the resulting document(s), not individual items. */
@@ -95,7 +102,7 @@ export interface RetainBatchOptions {
 	async?: boolean;
 }
 
-export interface RecallOptions {
+export interface RecallOptions extends HindsightRequestOptions {
 	types?: string[];
 	maxTokens?: number;
 	budget?: Budget;
@@ -103,19 +110,19 @@ export interface RecallOptions {
 	tagsMatch?: TagsMatch;
 }
 
-export interface ReflectOptions {
+export interface ReflectOptions extends HindsightRequestOptions {
 	context?: string;
 	budget?: Budget;
 	tags?: string[];
 	tagsMatch?: TagsMatch;
 }
 
-export interface CreateBankOptions {
+export interface CreateBankOptions extends HindsightRequestOptions {
 	reflectMission?: string;
 	retainMission?: string;
 }
 
-export interface ListMemoriesOptions {
+export interface ListMemoriesOptions extends HindsightRequestOptions {
 	limit?: number;
 	offset?: number;
 	type?: string;
@@ -123,12 +130,12 @@ export interface ListMemoriesOptions {
 	consolidationState?: ConsolidationState;
 }
 
-export interface ListDocumentsOptions {
+export interface ListDocumentsOptions extends HindsightRequestOptions {
 	limit?: number;
 	offset?: number;
 }
 
-export interface UpdateDocumentOptions {
+export interface UpdateDocumentOptions extends HindsightRequestOptions {
 	tags?: string[];
 }
 
@@ -166,7 +173,7 @@ export interface MentalModelHistoryEntry {
 	[key: string]: unknown;
 }
 
-export interface CreateMentalModelOptions {
+export interface CreateMentalModelOptions extends HindsightRequestOptions {
 	id?: string;
 	tags?: string[];
 	maxTokens?: number;
@@ -183,11 +190,11 @@ export interface RefreshMentalModelResponse {
 	[key: string]: unknown;
 }
 
-export interface ListMentalModelsOptions {
+export interface ListMentalModelsOptions extends HindsightRequestOptions {
 	detail?: MentalModelDetail;
 }
 
-export interface GetMentalModelOptions {
+export interface GetMentalModelOptions extends HindsightRequestOptions {
 	detail?: MentalModelDetail;
 }
 
@@ -208,6 +215,7 @@ interface RequestOptions {
 	query?: Record<string, unknown>;
 	/** Return null instead of throwing on a 404 response. */
 	allow404?: boolean;
+	signal?: AbortSignal;
 }
 
 export class HindsightApi {
@@ -240,7 +248,10 @@ export class HindsightApi {
 			"POST",
 			`/v1/default/banks/${encodeURIComponent(bankId)}/memories`,
 			"retain",
-			{ body: { items: [item], async: options?.async } },
+			{
+				body: { items: [item], async: options?.async },
+				signal: options?.signal,
+			},
 		);
 	}
 
@@ -270,6 +281,7 @@ export class HindsightApi {
 					document_tags: options?.documentTags,
 					async: options?.async,
 				},
+				signal: options?.signal,
 			},
 		);
 	}
@@ -288,6 +300,7 @@ export class HindsightApi {
 					tags: options?.tags,
 					tags_match: options?.tagsMatch,
 				},
+				signal: options?.signal,
 			},
 		);
 	}
@@ -305,6 +318,7 @@ export class HindsightApi {
 					tags: options?.tags,
 					tags_match: options?.tagsMatch,
 				},
+				signal: options?.signal,
 			},
 		);
 	}
@@ -319,6 +333,7 @@ export class HindsightApi {
 					reflect_mission: options.reflectMission,
 					retain_mission: options.retainMission,
 				},
+				signal: options.signal,
 			},
 		);
 	}
@@ -340,6 +355,7 @@ export class HindsightApi {
 					limit: options?.limit,
 					offset: options?.offset,
 				},
+				signal: options?.signal,
 			},
 		);
 	}
@@ -350,7 +366,7 @@ export class HindsightApi {
 			"GET",
 			`/v1/default/banks/${encodeURIComponent(bankId)}/documents`,
 			"listDocuments",
-			{ query: { limit: options?.limit, offset: options?.offset } },
+			{ query: { limit: options?.limit, offset: options?.offset }, signal: options?.signal },
 		);
 	}
 
@@ -370,7 +386,7 @@ export class HindsightApi {
 			"PATCH",
 			`/v1/default/banks/${encodeURIComponent(bankId)}/documents/${encodeURIComponent(documentId)}`,
 			"updateDocument",
-			{ body: { tags: options.tags } },
+			{ body: { tags: options.tags }, signal: options.signal },
 		);
 	}
 
@@ -399,7 +415,7 @@ export class HindsightApi {
 			"GET",
 			`/v1/default/banks/${encodeURIComponent(bankId)}/mental-models`,
 			"listMentalModels",
-			{ query: { detail: options?.detail ?? "content" } },
+			{ query: { detail: options?.detail ?? "content" }, signal: options?.signal },
 		);
 	}
 
@@ -413,7 +429,7 @@ export class HindsightApi {
 			"GET",
 			`/v1/default/banks/${encodeURIComponent(bankId)}/mental-models/${encodeURIComponent(mentalModelId)}`,
 			"getMentalModel",
-			{ query: { detail: options?.detail ?? "content" }, allow404: true },
+			{ query: { detail: options?.detail ?? "content" }, allow404: true, signal: options?.signal },
 		);
 	}
 
@@ -441,6 +457,7 @@ export class HindsightApi {
 					max_tokens: options?.maxTokens,
 					trigger: options?.trigger,
 				},
+				signal: options?.signal,
 			},
 		);
 	}
@@ -489,7 +506,11 @@ export class HindsightApi {
 			if (qs) url += `?${qs}`;
 		}
 
-		const init: RequestInit = { method, headers: this.#headers };
+		const init: RequestInit = {
+			method,
+			headers: this.#headers,
+			signal: withTimeoutSignal(HINDSIGHT_REQUEST_TIMEOUT_MS, opts?.signal),
+		};
 		if (opts?.body !== undefined) {
 			init.body = JSON.stringify(pruneUndefined(opts.body));
 		}
@@ -498,11 +519,10 @@ export class HindsightApi {
 		try {
 			response = await fetch(url, init);
 		} catch (err) {
-			throw new HindsightError(
-				`${operation} request failed: ${err instanceof Error ? err.message : String(err)}`,
-				undefined,
-				err,
-			);
+			const message = isTimeoutError(err)
+				? `${operation} request timed out after 30s`
+				: `${operation} request failed: ${err instanceof Error ? err.message : String(err)}`;
+			throw new HindsightError(message, undefined, err);
 		}
 
 		if (opts?.allow404 && response.status === 404) {