@cortexkit/aft-opencode 0.35.4 → 0.36.1

package/dist/shared/bash-hints.d.ts

@@ -1,2 +1,2 @@
-export { maybeAppendConflictsHint, maybeAppendGrepHint } from "@cortexkit/aft-bridge";
+export { maybeAppendConflictsHint } from "@cortexkit/aft-bridge";
 //# sourceMappingURL=bash-hints.d.ts.map

package/dist/shared/bash-hints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bash-hints.d.ts","sourceRoot":"","sources":["../../src/shared/bash-hints.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"bash-hints.d.ts","sourceRoot":"","sources":["../../src/shared/bash-hints.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/shared/rpc-client.d.ts

@@ -26,6 +26,8 @@ export declare class AftRpcClient {
      */
     private resolvePortInfos;
     private readAllPortFiles;
+    /** Delete a port file whose owning process is provably dead (best-effort). */
+    private reclaimDeadPortFile;
     private parsePortFile;
     private portFailureKey;
     private clearPortFailure;

package/dist/shared/rpc-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-client.d.ts","sourceRoot":"","sources":["../../src/shared/rpc-client.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AA4BD,qBAAa,YAAY;IACvB,OAAO,CAAC,IAAI,CAAuB;IACnC,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,iBAAiB,CAA6B;gBAE1C,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAKjD,iFAAiF;IAC3E,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACpC,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,CAAC,CAAC;YAyCC,OAAO;IAsBrB;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IAM5B,4CAA4C;IACtC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IASrC;;;;OAIG;YACW,gBAAgB;IAwB9B,OAAO,CAAC,gBAAgB;IAiCxB,OAAO,CAAC,aAAa;IAuBrB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,iBAAiB;YAsBX,WAAW;YAcX,gBAAgB;IAmB9B,KAAK,IAAI,IAAI;CAKd"}
+{"version":3,"file":"rpc-client.d.ts","sourceRoot":"","sources":["../../src/shared/rpc-client.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AA4BD,qBAAa,YAAY;IACvB,OAAO,CAAC,IAAI,CAAuB;IACnC,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,iBAAiB,CAA6B;gBAE1C,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAKjD,iFAAiF;IAC3E,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACpC,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,CAAC,CAAC;YAyCC,OAAO;IAsBrB;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IAM5B,4CAA4C;IACtC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IASrC;;;;OAIG;YACW,gBAAgB;IAwB9B,OAAO,CAAC,gBAAgB;IAwDxB,8EAA8E;IAC9E,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,iBAAiB;YAsBX,WAAW;YAkCX,gBAAgB;IAmB9B,KAAK,IAAI,IAAI;CAKd"}

package/dist/shared/rpc-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-server.d.ts","sourceRoot":"","sources":["../../src/shared/rpc-server.ts"],"names":[],"mappings":"AAOA,KAAK,UAAU,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAExF,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,IAAI,CAAK;IACjB,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,QAAQ,CAAiC;IACjD,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAS;IACzB,oFAAoF;IACpF,OAAO,CAAC,UAAU,CAAS;gBAEf,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAMjD,sCAAsC;IACtC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI;IAIjD,6DAA6D;IACvD,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;IA0C9B,8CAA8C;IAC9C,IAAI,IAAI,IAAI;IAaZ,OAAO,CAAC,QAAQ;CAoEjB"}
+{"version":3,"file":"rpc-server.d.ts","sourceRoot":"","sources":["../../src/shared/rpc-server.ts"],"names":[],"mappings":"AAOA,KAAK,UAAU,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAExF,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,IAAI,CAAK;IACjB,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,QAAQ,CAAiC;IACjD,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAS;IACzB,oFAAoF;IACpF,OAAO,CAAC,UAAU,CAAS;gBAEf,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAMjD,sCAAsC;IACtC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI;IAIjD,6DAA6D;IACvD,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;IAmD9B,8CAA8C;IAC9C,IAAI,IAAI,IAAI;IAaZ,OAAO,CAAC,QAAQ;CAoEjB"}

package/dist/shared/rpc-utils.d.ts

@@ -26,4 +26,27 @@ export declare function rpcPortFilePath(storageDir: string, directory: string):
  * last-write-wins racing under `--port 0`).
  */
 export declare function rpcPortFileDir(storageDir: string, directory: string): string;
+/**
+ * Contents of a per-instance RPC port file. `pid` + `started_at` let the client
+ * skip files whose owning process is dead (no health-check round-trip) and pick
+ * the freshest live server, instead of wading through every crash/restart
+ * leftover. Older files carry only `{ port, token }` (no pid); those are treated
+ * as "can't prove dead" and fall back to the health-check path.
+ */
+export interface RpcPortRecord {
+    port: number;
+    token: string | null;
+    /** PID of the plugin process that owns this server, if recorded. */
+    pid?: number;
+    /** `Date.now()` when this server started, for newest-first ordering. */
+    started_at?: number;
+}
+/** True if `pid` names a live process. `process.kill(pid, 0)` sends no signal. */
+export declare function isPidAlive(pid: number | undefined): boolean;
+/**
+ * Parse a port file's contents into a record. Accepts the current JSON shape
+ * (`{ port, token, pid?, started_at? }`) and the legacy bare-integer format
+ * (unauthenticated, pre-v0.28.2). Returns `null` for unusable contents.
+ */
+export declare function parseRpcPortRecord(content: string): RpcPortRecord | null;
 //# sourceMappingURL=rpc-utils.d.ts.map

package/dist/shared/rpc-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-utils.d.ts","sourceRoot":"","sources":["../../src/shared/rpc-utils.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAIrD;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAG7E;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAG5E"}
+{"version":3,"file":"rpc-utils.d.ts","sourceRoot":"","sources":["../../src/shared/rpc-utils.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAIrD;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAG7E;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAG5E;AAED;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,oEAAoE;IACpE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,wEAAwE;IACxE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,kFAAkF;AAClF,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAS3D;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CA2BxE"}

package/dist/status-bar-inject.d.ts

@@ -5,7 +5,7 @@ import { type StatusBarCounts } from "@cortexkit/aft-bridge";
  * (unchanged since last emit and heartbeat not elapsed) or when counts are
  * absent (no inspect scan has populated Tier-2 yet).
  */
-export declare function statusBarSuffixForSession(sessionID: string, counts: StatusBarCounts | undefined): string;
+export declare function statusBarSuffixForSession(sessionID: string, counts: StatusBarCounts | undefined, force?: boolean): string;
 /** Drop a session's emit state (on session delete/shutdown). */
 export declare function clearStatusBarSession(sessionID: string): void;
 //# sourceMappingURL=status-bar-inject.d.ts.map

package/dist/status-bar-inject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"status-bar-inject.d.ts","sourceRoot":"","sources":["../src/status-bar-inject.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,KAAK,eAAe,EAIrB,MAAM,uBAAuB,CAAC;AAI/B;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,eAAe,GAAG,SAAS,GAClC,MAAM,CAQR;AAED,gEAAgE;AAChE,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAE7D"}
+{"version":3,"file":"status-bar-inject.d.ts","sourceRoot":"","sources":["../src/status-bar-inject.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,KAAK,eAAe,EAIrB,MAAM,uBAAuB,CAAC;AAI/B;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,eAAe,GAAG,SAAS,EACnC,KAAK,UAAQ,GACZ,MAAM,CAkBR;AAED,gEAAgE;AAChE,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAE7D"}

package/dist/tool-perf.d.ts

@@ -0,0 +1,17 @@
+import type { ToolDefinition } from "@opencode-ai/plugin";
+/**
+ * Mark the instant just before a bridge request is sent. First mark wins so a
+ * tool that issues several bridge requests still reports one bridge window
+ * (first send -> last response); the intervening plugin work folds into it.
+ */
+export declare function markBridgeStart(): void;
+/** Mark the instant just after the bridge responds (last response wins). */
+export declare function markBridgeEnd(): void;
+/**
+ * Wrap every tool's execute() so each invocation logs a one-line latency
+ * breakdown: total, pre-bridge (arg/permission/session-dir work), bridge
+ * round-trip, and post-bridge (result formatting). Mutates execute in place;
+ * call after the final tool surface is built so disabled tools aren't wrapped.
+ */
+export declare function instrumentToolMap(tools: Record<string, ToolDefinition>): Record<string, ToolDefinition>;
+//# sourceMappingURL=tool-perf.d.ts.map

package/dist/tool-perf.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-perf.d.ts","sourceRoot":"","sources":["../src/tool-perf.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAmB1D;;;;GAIG;AACH,wBAAgB,eAAe,IAAI,IAAI,CAKtC;AAED,4EAA4E;AAC5E,wBAAgB,aAAa,IAAI,IAAI,CAKpC;AAmBD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,GACpC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAoBhC"}

package/dist/tools/_shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"_shared.d.ts","sourceRoot":"","sources":["../../src/tools/_shared.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"_shared.d.ts","sourceRoot":"","sources":["../../src/tools/_shared.ts"],"names":[],"mappings":"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"}

package/dist/tools/bash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bash.d.ts","sourceRoot":"","sources":["../../src/tools/bash.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAe,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAavE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAmEjD,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAuQjE;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAyBvE;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAuBrE"}
+{"version":3,"file":"bash.d.ts","sourceRoot":"","sources":["../../src/tools/bash.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAe,cAAc,EAAc,MAAM,qBAAqB,CAAC;AAYnF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAiFjD,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAsQjE;AAMD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAyBvE;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAuBrE"}

package/dist/tools/hoisted.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hoisted.d.ts","sourceRoot":"","sources":["../../src/tools/hoisted.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAKH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAK1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AA8EjD,wEAAwE;AACxE,eAAO,MAAM,wBAAwB,GAAI,IAAI,MAAM,EAAE,QAAQ,MAAM,EAAE,OAAO,MAAM,KAAG,MAChD,CAAC;AA0RtC;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAmKjE;AAknCD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA0B/E;AAMD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA+FnF"}
+{"version":3,"file":"hoisted.d.ts","sourceRoot":"","sources":["../../src/tools/hoisted.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAKH,OAAO,KAAK,EAAE,cAAc,EAAc,MAAM,qBAAqB,CAAC;AAItE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAwEjD,wEAAwE;AACxE,eAAO,MAAM,wBAAwB,GAAI,IAAI,MAAM,EAAE,QAAQ,MAAM,EAAE,OAAO,MAAM,KAAG,MAChD,CAAC;AA0RtC;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAwJjE;AA2mCD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA0B/E;AAMD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA+FnF"}

package/dist/tools/navigation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"navigation.d.ts","sourceRoot":"","sources":["../../src/tools/navigation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAYjD;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAwFlF"}
+{"version":3,"file":"navigation.d.ts","sourceRoot":"","sources":["../../src/tools/navigation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAqBjD;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAkGlF"}

package/dist/tools/reading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reading.d.ts","sourceRoot":"","sources":["../../src/tools/reading.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAe,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAGvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AA0CjD,UAAU,qBAAqB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,eAAe;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,qBAAqB,EAAE,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAiX/E;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EAAE,EACjB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GACnC,eAAe,CAyBjB;AA+CD,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CA2ChF"}
+{"version":3,"file":"reading.d.ts","sourceRoot":"","sources":["../../src/tools/reading.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAe,cAAc,EAAc,MAAM,qBAAqB,CAAC;AAEnF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAoCjD,UAAU,qBAAqB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,eAAe;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,qBAAqB,EAAE,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAqX/E;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EAAE,EACjB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GACnC,eAAe,CAyBjB;AA+CD,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CA2ChF"}

package/dist/tools/safety.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"safety.d.ts","sourceRoot":"","sources":["../../src/tools/safety.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAe,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAwCjD;;;GAGG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA+I9E"}
+{"version":3,"file":"safety.d.ts","sourceRoot":"","sources":["../../src/tools/safety.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAe,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAwCjD;;;GAGG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAkJ9E"}

package/dist/tui.js

@@ -1,85 +1,61 @@
 // src/tui/index.tsx
 import { createMemo as createMemo2, createSignal as createSignal2, onCleanup as onCleanup2 } from "solid-js";
 // package.json
-var version = "0.35.4";
+var version = "0.36.1";
 
 // src/shared/rpc-client.ts
 import { existsSync, readdirSync, readFileSync, unlinkSync } from "node:fs";
-import { join as join3 } from "node:path";
-
-// src/logger.ts
-import * as fs from "node:fs";
-import * as os from "node:os";
-import * as path from "node:path";
-var TAG = "[aft-plugin]";
-var isTestEnv = process.env.BUN_TEST === "1" || false;
-var logFile = path.join(os.tmpdir(), isTestEnv ? "aft-plugin-test.log" : "aft-plugin.log");
-var useStderr = process.env.AFT_LOG_STDERR === "1";
-var buffer = [];
-var flushTimer = null;
-var FLUSH_INTERVAL_MS = 500;
-var BUFFER_SIZE_LIMIT = 50;
-function flush() {
-  if (buffer.length === 0)
-    return;
-  const data = buffer.join("");
-  buffer = [];
-  try {
-    if (useStderr) {
-      process.stderr.write(data);
-    } else {
-      fs.appendFileSync(logFile, data);
-    }
-  } catch {}
-}
-function scheduleFlush() {
-  if (flushTimer)
-    return;
-  flushTimer = setTimeout(() => {
-    flushTimer = null;
-    flush();
-  }, FLUSH_INTERVAL_MS);
-  if (flushTimer && typeof flushTimer === "object" && "unref" in flushTimer) {
-    flushTimer.unref();
-  }
-}
-function write(level, message, data, sessionId) {
-  try {
-    const timestamp = new Date().toISOString();
-    const serialized = data === undefined ? "" : ` ${JSON.stringify(data)}`;
-    const sessionPrefix = sessionId ? ` [${sessionId}]` : "";
-    const line = `[${timestamp}] ${level} ${TAG}${sessionPrefix} ${message}${serialized}
-`;
-    if (useStderr) {
-      process.stderr.write(line);
-      return;
-    }
-    buffer.push(line);
-    if (buffer.length >= BUFFER_SIZE_LIMIT) {
-      flush();
-    } else {
-      scheduleFlush();
-    }
-  } catch {}
-}
-function warn(message, data) {
-  write("WARN", message, data);
-}
+import { join as join2 } from "node:path";
 
 // src/shared/rpc-utils.ts
 import { createHash } from "node:crypto";
-import { join as join2 } from "node:path";
+import { join } from "node:path";
 function projectHash(directory) {
   const normalized = directory.replace(/\/+$/, "");
   return createHash("sha256").update(normalized).digest("hex").slice(0, 16);
 }
 function rpcPortFilePath(storageDir, directory) {
   const hash = projectHash(directory);
-  return join2(storageDir, "rpc", hash, "port");
+  return join(storageDir, "rpc", hash, "port");
 }
 function rpcPortFileDir(storageDir, directory) {
   const hash = projectHash(directory);
-  return join2(storageDir, "rpc", hash, "ports");
+  return join(storageDir, "rpc", hash, "ports");
+}
+function isPidAlive(pid) {
+  if (typeof pid !== "number" || !Number.isInteger(pid) || pid <= 0)
+    return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (err) {
+    return err.code === "EPERM";
+  }
+}
+function parseRpcPortRecord(content) {
+  const trimmed = content.trim();
+  if (trimmed.length === 0)
+    return null;
+  if (trimmed.startsWith("{")) {
+    try {
+      const parsed = JSON.parse(trimmed);
+      const port2 = typeof parsed.port === "number" ? parsed.port : Number.NaN;
+      if (!Number.isInteger(port2) || port2 <= 0 || port2 > 65535)
+        return null;
+      return {
+        port: port2,
+        token: typeof parsed.token === "string" ? parsed.token : null,
+        pid: typeof parsed.pid === "number" && Number.isInteger(parsed.pid) ? parsed.pid : undefined,
+        started_at: typeof parsed.started_at === "number" ? parsed.started_at : undefined
+      };
+    } catch {
+      return null;
+    }
+  }
+  const port = Number.parseInt(trimmed, 10);
+  if (!Number.isInteger(port) || port <= 0 || port > 65535)
+    return null;
+  return { port, token: null };
 }
 
 // src/shared/rpc-client.ts
@@ -185,7 +161,7 @@ class AftRpcClient {
         const alive = [];
         for (const info of infos) {
           throwIfAborted(signal);
-          if (await this.healthCheck(info.port, signal)) {
+          if (await this.healthCheck(info.port, info.pid, signal)) {
             this.clearPortFailure(info);
             alive.push(info);
           } else {
@@ -212,15 +188,23 @@ class AftRpcClient {
     };
     if (existsSync(this.portsDir)) {
       try {
-        const entries = readdirSync(this.portsDir).sort();
-        for (const entry of entries) {
+        const live = [];
+        for (const entry of readdirSync(this.portsDir)) {
           if (!entry.endsWith(".json"))
             continue;
-          const filePath = join3(this.portsDir, entry);
+          const filePath = join2(this.portsDir, entry);
           const info = this.parsePortFile(filePath);
-          if (info)
-            add({ ...info, source: "instance", path: filePath });
+          if (!info)
+            continue;
+          if (info.pid !== undefined && !isPidAlive(info.pid)) {
+            this.reclaimDeadPortFile(filePath);
+            continue;
+          }
+          live.push({ ...info, source: "instance", path: filePath });
         }
+        live.sort((a, b) => (b.started_at ?? 0) - (a.started_at ?? 0) || (b.pid ?? 0) - (a.pid ?? 0) || (b.port ?? 0) - (a.port ?? 0));
+        for (const info of live)
+          add(info);
       } catch {}
     }
     const legacyInfo = this.parsePortFile(this.legacyPortFile);
@@ -228,24 +212,15 @@ class AftRpcClient {
       add({ ...legacyInfo, source: "legacy", path: this.legacyPortFile });
     return collected;
   }
+  reclaimDeadPortFile(filePath) {
+    try {
+      unlinkSync(filePath);
+    } catch {}
+  }
   parsePortFile(filePath) {
     try {
-      const content = readFileSync(filePath, "utf-8").trim();
-      let port;
-      let token;
-      if (content.startsWith("{")) {
-        const parsed = JSON.parse(content);
-        port = typeof parsed.port === "number" ? parsed.port : Number.NaN;
-        token = typeof parsed.token === "string" ? parsed.token : null;
-      } else {
-        warn("RPC port file uses legacy integer format; unauthenticated RPC is deprecated");
-        port = Number.parseInt(content, 10);
-        token = null;
-      }
-      if (Number.isNaN(port) || port <= 0 || port > 65535) {
-        return null;
-      }
-      return { port, token };
+      const content = readFileSync(filePath, "utf-8");
+      return parseRpcPortRecord(content);
     } catch {
       return null;
     }
@@ -277,10 +252,21 @@ class AftRpcClient {
       }
     } catch {}
   }
-  async healthCheck(port, signal) {
+  async healthCheck(port, expectedPid, signal) {
     try {
       const response = await this.fetchWithTimeout(`http://127.0.0.1:${port}/health`, { method: "GET" }, signal);
-      return response.ok;
+      if (!response.ok)
+        return false;
+      if (expectedPid !== undefined) {
+        try {
+          const body = await response.json();
+          if (typeof body?.pid === "number" && body.pid !== expectedPid)
+            return false;
+        } catch {
+          return false;
+        }
+      }
+      return true;
     } catch {
       throwIfAborted(signal);
       return false;
@@ -454,7 +440,7 @@ import { createEffect, createMemo, createSignal, on, onCleanup } from "solid-js"
 
 // src/shared/storage-paths.ts
 import { homedir } from "node:os";
-import { join as join4 } from "node:path";
+import { join as join3 } from "node:path";
 function homeDir() {
   if (process.platform === "win32")
     return process.env.USERPROFILE || process.env.HOME || homedir();
@@ -464,12 +450,12 @@ function dataHome() {
   if (process.env.XDG_DATA_HOME)
     return process.env.XDG_DATA_HOME;
   if (process.platform === "win32") {
-    return process.env.LOCALAPPDATA || process.env.APPDATA || join4(homeDir(), "AppData", "Local");
+    return process.env.LOCALAPPDATA || process.env.APPDATA || join3(homeDir(), "AppData", "Local");
   }
-  return join4(homeDir(), ".local", "share");
+  return join3(homeDir(), ".local", "share");
 }
 function resolveCortexKitStorageRoot() {
-  return join4(dataHome(), "cortexkit", "aft");
+  return join3(dataHome(), "cortexkit", "aft");
 }
 
 // src/tui/sidebar.tsx

package/dist/workflow-hints.d.ts

@@ -8,6 +8,8 @@ export interface WorkflowHintsOpts {
     semanticEnabled: boolean;
     /** `experimental.bash.background` — gates background-bash paragraph. */
     bashBackgroundEnabled: boolean;
+    /** Resolved bash compression flag. */
+    bashCompressionEnabled: boolean;
     /** Set of disabled tool names (after surface filtering). */
     disabledTools: Set<string>;
 }

package/dist/workflow-hints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-hints.d.ts","sourceRoot":"","sources":["../src/workflow-hints.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,aAAa,CAAC;AAEhE,MAAM,WAAW,iBAAiB;IAChC,oEAAoE;IACpE,WAAW,EAAE,SAAS,GAAG,aAAa,GAAG,KAAK,CAAC;IAC/C,4EAA4E;IAC5E,aAAa,EAAE,OAAO,CAAC;IACvB,mEAAmE;IACnE,eAAe,EAAE,OAAO,CAAC;IACzB,wEAAwE;IACxE,qBAAqB,EAAE,OAAO,CAAC;IAC/B,4DAA4D;IAC5D,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC5B;AAID;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA+FzE;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,IAAI,CAQjG"}
+{"version":3,"file":"workflow-hints.d.ts","sourceRoot":"","sources":["../src/workflow-hints.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,aAAa,CAAC;AAEhE,MAAM,WAAW,iBAAiB;IAChC,oEAAoE;IACpE,WAAW,EAAE,SAAS,GAAG,aAAa,GAAG,KAAK,CAAC;IAC/C,4EAA4E;IAC5E,aAAa,EAAE,OAAO,CAAC;IACvB,mEAAmE;IACnE,eAAe,EAAE,OAAO,CAAC;IACzB,wEAAwE;IACxE,qBAAqB,EAAE,OAAO,CAAC;IAC/B,sCAAsC;IACtC,sBAAsB,EAAE,OAAO,CAAC;IAChC,4DAA4D;IAC5D,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC5B;AAID;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA8GzE;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,IAAI,CASjG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-opencode",
-  "version": "0.35.4",
+  "version": "0.36.1",
   "type": "module",
   "description": "OpenCode plugin for Agent File Tools (AFT) — tree-sitter and lsp powered code analysis",
   "main": "dist/index.js",
@@ -30,19 +30,19 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.2.0",
-    "@cortexkit/aft-bridge": "0.35.4",
+    "@cortexkit/aft-bridge": "0.36.1",
     "@xterm/headless": "^5.5.0",
     "comment-json": "^4.6.2",
     "undici": "^7.25.0",
     "zod": "^4.1.8"
   },
   "optionalDependencies": {
-    "@cortexkit/aft-darwin-arm64": "0.35.4",
-    "@cortexkit/aft-darwin-x64": "0.35.4",
-    "@cortexkit/aft-linux-arm64": "0.35.4",
-    "@cortexkit/aft-linux-x64": "0.35.4",
-    "@cortexkit/aft-win32-arm64": "0.35.4",
-    "@cortexkit/aft-win32-x64": "0.35.4"
+    "@cortexkit/aft-darwin-arm64": "0.36.1",
+    "@cortexkit/aft-darwin-x64": "0.36.1",
+    "@cortexkit/aft-linux-arm64": "0.36.1",
+    "@cortexkit/aft-linux-x64": "0.36.1",
+    "@cortexkit/aft-win32-arm64": "0.36.1",
+    "@cortexkit/aft-win32-x64": "0.36.1"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "^1.15.11",

package/src/shared/bash-hints.ts

@@ -1,4 +1,4 @@
 // Bash-output hint nudges now live in the shared bridge package so both plugin
 // hosts use one implementation. Re-exported here to keep the existing OpenCode
 // import path stable.
-export { maybeAppendConflictsHint, maybeAppendGrepHint } from "@cortexkit/aft-bridge";
+export { maybeAppendConflictsHint } from "@cortexkit/aft-bridge";

package/src/shared/rpc-client.ts

@@ -1,14 +1,13 @@
 import { existsSync, readdirSync, readFileSync, unlinkSync } from "node:fs";
 import { join } from "node:path";
-import { warn } from "../logger";
-import { rpcPortFileDir, rpcPortFilePath } from "./rpc-utils";
+import { isPidAlive, parseRpcPortRecord, rpcPortFileDir, rpcPortFilePath } from "./rpc-utils";
 
 const MAX_RETRIES = 10;
 const RETRY_DELAY_MS = 500;
 const REQUEST_TIMEOUT_MS = 5000;
 
 type PortInfoSource = "instance" | "legacy";
-type ParsedPortInfo = { port: number; token: string | null };
+type ParsedPortInfo = { port: number; token: string | null; pid?: number; started_at?: number };
 type PortInfo = ParsedPortInfo & { source: PortInfoSource; path?: string };
 
 export interface AftRpcCallOptions {
@@ -155,7 +154,7 @@ export class AftRpcClient {
         const alive: PortInfo[] = [];
         for (const info of infos) {
           throwIfAborted(signal);
-          if (await this.healthCheck(info.port, signal)) {
+          if (await this.healthCheck(info.port, info.pid, signal)) {
             this.clearPortFailure(info);
             alive.push(info);
           } else {
@@ -180,16 +179,39 @@ export class AftRpcClient {
       collected.push(info);
     };
 
-    // Per-instance directory (v0.28.2+): one file per plugin load.
+    // Per-instance directory (v0.28.2+): one file per plugin load. Each file now
+    // records the owning process pid; we skip (and reclaim) any whose process is
+    // dead so a poll doesn't wade through crash/restart leftovers, and we order
+    // newest-first so the freshest live server wins the port de-dupe (a stale
+    // file naming a reused port can no longer mask a fresh one with its old token).
     if (existsSync(this.portsDir)) {
       try {
-        const entries = readdirSync(this.portsDir).sort();
-        for (const entry of entries) {
+        const live: PortInfo[] = [];
+        for (const entry of readdirSync(this.portsDir)) {
           if (!entry.endsWith(".json")) continue;
           const filePath = join(this.portsDir, entry);
           const info = this.parsePortFile(filePath);
-          if (info) add({ ...info, source: "instance", path: filePath });
+          if (!info) continue;
+          // Only reclaim when we can PROVE the owner is dead (pid present and not
+          // alive). Files without a pid (older format) are kept and fall through
+          // to the health check, since we can't prove they're dead.
+          if (info.pid !== undefined && !isPidAlive(info.pid)) {
+            this.reclaimDeadPortFile(filePath);
+            continue;
+          }
+          live.push({ ...info, source: "instance", path: filePath });
         }
+        // Newest first: files with a started_at sort before those without.
+        // Break ties deterministically (equal/absent started_at) by pid then
+        // port so selection is stable across reads rather than depending on
+        // directory iteration order.
+        live.sort(
+          (a, b) =>
+            (b.started_at ?? 0) - (a.started_at ?? 0) ||
+            (b.pid ?? 0) - (a.pid ?? 0) ||
+            (b.port ?? 0) - (a.port ?? 0),
+        );
+        for (const info of live) add(info);
       } catch {
         // ignore read errors
       }
@@ -204,24 +226,19 @@ export class AftRpcClient {
     return collected;
   }
 
+  /** Delete a port file whose owning process is provably dead (best-effort). */
+  private reclaimDeadPortFile(filePath: string): void {
+    try {
+      unlinkSync(filePath);
+    } catch {
+      // best-effort; a concurrent writer may have already replaced it
+    }
+  }
+
   private parsePortFile(filePath: string): ParsedPortInfo | null {
     try {
-      const content = readFileSync(filePath, "utf-8").trim();
-      let port: number;
-      let token: string | null;
-      if (content.startsWith("{")) {
-        const parsed = JSON.parse(content) as { port?: unknown; token?: unknown };
-        port = typeof parsed.port === "number" ? parsed.port : Number.NaN;
-        token = typeof parsed.token === "string" ? parsed.token : null;
-      } else {
-        warn("RPC port file uses legacy integer format; unauthenticated RPC is deprecated");
-        port = Number.parseInt(content, 10);
-        token = null;
-      }
-      if (Number.isNaN(port) || port <= 0 || port > 65535) {
-        return null;
-      }
-      return { port, token };
+      const content = readFileSync(filePath, "utf-8");
+      return parseRpcPortRecord(content);
     } catch {
       return null;
     }
@@ -259,14 +276,34 @@ export class AftRpcClient {
     }
   }
 
-  private async healthCheck(port: number, signal?: AbortSignal): Promise<boolean> {
+  private async healthCheck(
+    port: number,
+    expectedPid: number | undefined,
+    signal?: AbortSignal,
+  ): Promise<boolean> {
     try {
       const response = await this.fetchWithTimeout(
         `http://127.0.0.1:${port}/health`,
         { method: "GET" },
         signal,
       );
-      return response.ok;
+      if (!response.ok) return false;
+      // Identity check: the port file records the owning pid and `/health`
+      // echoes the live server's pid. If they disagree, the port was recycled
+      // by a *different* AFT server (or an unrelated localhost service that
+      // happens to answer /health), so this port file is stale — reject it so
+      // we don't POST this file's token to the wrong server. Only enforced when
+      // both sides expose a pid (older port files omit it).
+      if (expectedPid !== undefined) {
+        try {
+          const body = (await response.json()) as { pid?: unknown };
+          if (typeof body?.pid === "number" && body.pid !== expectedPid) return false;
+        } catch {
+          // Non-JSON / unexpected body: not a healthy AFT server we trust.
+          return false;
+        }
+      }
+      return true;
     } catch {
       throwIfAborted(signal);
       return false;

package/src/shared/rpc-server.ts

@@ -53,10 +53,19 @@ export class AftRpcServer {
           const dir = dirname(this.portFilePath);
           mkdirSync(dir, { recursive: true, mode: 0o700 });
           const tmpPath = `${this.portFilePath}.tmp`;
-          writeFileSync(tmpPath, JSON.stringify({ port: this.port, token: this.token }), {
-            encoding: "utf-8",
-            mode: 0o600,
-          });
+          // Record pid + started_at so the client can skip files whose owning
+          // process is dead (without a health-check round-trip) and prefer the
+          // freshest live server, instead of accumulating crash/restart leftovers.
+          writeFileSync(
+            tmpPath,
+            JSON.stringify({
+              port: this.port,
+              token: this.token,
+              pid: process.pid,
+              started_at: Date.now(),
+            }),
+            { encoding: "utf-8", mode: 0o600 },
+          );
           renameSync(tmpPath, this.portFilePath);
           log(`RPC server listening on 127.0.0.1:${this.port}`);
         } catch (err) {