@qduc/term2 0.11.0 → 0.12.0

package/dist/lib/editor-impl.d.ts

@@ -1,4 +1,4 @@
-import type { ApplyPatchOperation, ApplyPatchResult } from '@openai/agents';
+import type { ApplyPatchOperation, ApplyPatchResult } from '../contracts/patch.js';
 import type { ILoggingService, ISettingsService } from '../services/service-interfaces.js';
 import { ExecutionContext } from '../services/execution-context.js';
 /**

package/dist/lib/editor-impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editor-impl.d.ts","sourceRoot":"","sources":["../../source/lib/editor-impl.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC3F,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAgCpE;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IACrC,cAAc,EAAE,eAAe,CAAC;IAChC,eAAe,EAAE,gBAAgB,CAAC;IAClC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC;IAIS,UAAU,YAAY,OAAO,CAAC,mBAAmB,EAAE;QAAE,IAAI,EAAE,aAAa,CAAA;KAAE,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA8EvG,UAAU,YAAY,OAAO,CAAC,mBAAmB,EAAE;QAAE,IAAI,EAAE,aAAa,CAAA;KAAE,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA+FvG,UAAU,YAAY,OAAO,CAAC,mBAAmB,EAAE;QAAE,IAAI,EAAE,aAAa,CAAA;KAAE,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC;EAuDhH"}
+{"version":3,"file":"editor-impl.d.ts","sourceRoot":"","sources":["../../source/lib/editor-impl.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAC3F,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAgCpE;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IACrC,cAAc,EAAE,eAAe,CAAC;IAChC,eAAe,EAAE,gBAAgB,CAAC;IAClC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC;IAIS,UAAU,YAAY,OAAO,CAAC,mBAAmB,EAAE;QAAE,IAAI,EAAE,aAAa,CAAA;KAAE,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA8EvG,UAAU,YAAY,OAAO,CAAC,mBAAmB,EAAE;QAAE,IAAI,EAAE,aAAa,CAAA;KAAE,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA+FvG,UAAU,YAAY,OAAO,CAAC,mBAAmB,EAAE;QAAE,IAAI,EAAE,aAAa,CAAA;KAAE,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC;EAuDhH"}

package/dist/lib/editor-impl.js

@@ -1,6 +1,6 @@
 import { readFile, writeFile, mkdir, rm } from 'fs/promises';
 import path from 'path';
-import { applyDiff } from '@openai/agents';
+import { applyDiff } from '../utils/apply-diff.js';
 /**
  * Resolves a relative path and ensures it's within the workspace, unless the
  * caller opts out via `allowOutsideWorkspace: true`. Opting out is reserved

package/dist/lib/editor-impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"editor-impl.js","sourceRoot":"","sources":["../../source/lib/editor-impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"editor-impl.js","sourceRoot":"","sources":["../../source/lib/editor-impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAKnD;;;;;;GAMG;AACH,SAAS,oBAAoB,CAC3B,YAAoB,EACpB,OAAO,GAAW,OAAO,CAAC,GAAG,EAAE,EAC/B,OAA6C;IAE7C,MAAM,qBAAqB,GAAG,OAAO,EAAE,qBAAqB,IAAI,KAAK,CAAC;IACtE,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;IAE3D,IAAI,qBAAqB,EAAE,CAAC;QAC1B,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,UAAU,GAAG,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC;IAC/F,MAAM,QAAQ,GAAG,QAAQ,KAAK,aAAa,IAAI,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAE/E,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,gCAAgC,YAAY,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAIhC;IACC,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;IAEnE,OAAO;QACL,KAAK,CAAC,UAAU,CAAC,SAAgE;YAC/E,MAAM,iBAAiB,GAAG,eAAe,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;YACzE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC;YAC3C,MAAM,GAAG,GAAG,gBAAgB,EAAE,MAAM,EAAE,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YACxD,MAAM,UAAU,GAAG,gBAAgB,EAAE,aAAa,EAAE,CAAC;YACrD,MAAM,QAAQ,GAAG,gBAAgB,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,UAAU,CAAC;YAE9D,IAAI,CAAC;gBACH,oEAAoE;gBACpE,6EAA6E;gBAC7E,0EAA0E;gBAC1E,MAAM,UAAU,GAAG,oBAAoB,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAC;gBAExF,IAAI,iBAAiB,EAAE,CAAC;oBACtB,cAAc,CAAC,KAAK,CAAC,qCAAqC,EAAE;wBAC1D,IAAI,EAAE,QAAQ;wBACd,UAAU;qBACX,CAAC,CAAC;gBACL,CAAC;gBAED,kCAAkC;gBAClC,IAAI,CAAC;oBACH,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;gBACtB,CAAC;gBAAC,OAAO,eAAoB,EAAE,CAAC;oBAC9B,cAAc,CAAC,KAAK,CAAC,uCAAuC,EAAE;wBAC5D,IAAI,EAAE,QAAQ;wBACd,KAAK,EAAE,eAAe,EAAE,OAAO,IAAI,MAAM,CAAC,eAAe,CAAC;qBAC3D,CAAC,CAAC;oBACH,OAAO;wBACL,MAAM,EAAE,QAAQ;wBAChB,MAAM,EAAE,kBACN,eAAe,EAAE,OAAO,IAAI,MAAM,CAAC,eAAe,CACpD,+CAA+C;qBAChD,CAAC;gBACJ,CAAC;gBAED,iCAAiC;gBACjC,IAAI,QAAQ,IAAI,UAAU,EAAE,CAAC;oBAC3B,MAAM,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;gBACnD,CAAC;qBAAM,CAAC;oBACN,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC7D,CAAC;gBAED,2CAA2C;gBAC3C,MAAM,OAAO,GAAG,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;gBAEpC,IAAI,QAAQ,IAAI,UAAU,EAAE,CAAC;oBAC3B,MAAM,UAAU,CAAC,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;gBAClD,CAAC;qBAAM,CAAC;oBACN,MAAM,SAAS,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;gBAC/C,CAAC;gBAED,IAAI,iBAAiB,EAAE,CAAC;oBACtB,cAAc,CAAC,KAAK,CAAC,cAAc,EAAE;wBACnC,IAAI,EAAE,QAAQ;wBACd,aAAa,EAAE,OAAO,CAAC,MAAM;qBAC9B,CAAC,CAAC;gBACL,CAAC;gBAED,OAAO;oBACL,MAAM,EAAE,WAAW;oBACnB,MAAM,EAAE,WAAW,QAAQ,EAAE;iBAC9B,CAAC;YACJ,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACpB,IAAI,iBAAiB,EAAE,CAAC;oBACtB,cAAc,CAAC,KAAK,CAAC,uBAAuB,EAAE;wBAC5C,IAAI,EAAE,aAAa;wBACnB,IAAI,EAAE,QAAQ;wBACd,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;qBAC9D,CAAC,CAAC;gBACL,CAAC;gBACD,OAAO;oBACL,MAAM,EAAE,QAAQ;oBAChB,MAAM,EAAE,KAAK,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC;iBACvC,CAAC;YACJ,CAAC;QACH,CAAC;QAED,KAAK,CAAC,UAAU,CAAC,SAAgE;YAC/E,MAAM,iBAAiB,GAAG,eAAe,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;YACzE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC;YAC3C,MAAM,GAAG,GAAG,gBAAgB,EAAE,MAAM,EAAE,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YACxD,MAAM,UAAU,GAAG,gBAAgB,EAAE,aAAa,EAAE,CAAC;YACrD,MAAM,QAAQ,GAAG,gBAAgB,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,UAAU,CAAC;YAE9D,IAAI,CAAC;gBACH,oEAAoE;gBACpE,6EAA6E;gBAC7E,0EAA0E;gBAC1E,MAAM,UAAU,GAAG,oBAAoB,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAC;gBAExF,IAAI,iBAAiB,EAAE,CAAC;oBACtB,cAAc,CAAC,KAAK,CAAC,qCAAqC,EAAE;wBAC1D,IAAI,EAAE,QAAQ;wBACd,UAAU;qBACX,CAAC,CAAC;gBACL,CAAC;gBAED,qBAAqB;gBACrB,IAAI,QAAgB,CAAC;gBACrB,IAAI,CAAC;oBACH,IAAI,QAAQ,IAAI,UAAU,EAAE,CAAC;wBAC3B,QAAQ,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;oBACnD,CAAC;yBAAM,CAAC;wBACN,QAAQ,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;oBAChD,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAU,EAAE,CAAC;oBACpB,IAAI,KAAK,EAAE,IAAI,KAAK,QAAQ,EAAE,CAAC;wBAC7B,IAAI,iBAAiB,EAAE,CAAC;4BACtB,cAAc,CAAC,KAAK,CAAC,4BAA4B,EAAE;gCACjD,IAAI,EAAE,QAAQ;gCACd,UAAU;6BACX,CAAC,CAAC;wBACL,CAAC;wBACD,OAAO;4BACL,MAAM,EAAE,QAAQ;4BAChB,MAAM,EAAE,+BAA+B,QAAQ,EAAE;yBAClD,CAAC;oBACJ,CAAC;oBACD,MAAM,KAAK,CAAC;gBACd,CAAC;gBAED,kCAAkC;gBAClC,IAAI,CAAC;oBACH,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;gBAC5B,CAAC;gBAAC,OAAO,eAAoB,EAAE,CAAC;oBAC9B,cAAc,CAAC,KAAK,CAAC,uCAAuC,EAAE;wBAC5D,IAAI,EAAE,QAAQ;wBACd,KAAK,EAAE,eAAe,EAAE,OAAO,IAAI,MAAM,CAAC,eAAe,CAAC;qBAC3D,CAAC,CAAC;oBACH,OAAO;wBACL,MAAM,EAAE,QAAQ;wBAChB,MAAM,EAAE,kBACN,eAAe,EAAE,OAAO,IAAI,MAAM,CAAC,eAAe,CACpD,+CAA+C;qBAChD,CAAC;gBACJ,CAAC;gBAED,iCAAiC;gBACjC,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;gBAC1C,IAAI,QAAQ,IAAI,UAAU,EAAE,CAAC;oBAC3B,MAAM,UAAU,CAAC,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;gBAClD,CAAC;qBAAM,CAAC;oBACN,MAAM,SAAS,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;gBAC/C,CAAC;gBAED,IAAI,iBAAiB,EAAE,CAAC;oBACtB,cAAc,CAAC,KAAK,CAAC,cAAc,EAAE;wBACnC,IAAI,EAAE,QAAQ;wBACd,cAAc,EAAE,QAAQ,CAAC,MAAM;wBAC/B,aAAa,EAAE,OAAO,CAAC,MAAM;qBAC9B,CAAC,CAAC;gBACL,CAAC;gBAED,OAAO;oBACL,MAAM,EAAE,WAAW;oBACnB,MAAM,EAAE,WAAW,QAAQ,EAAE;iBAC9B,CAAC;YACJ,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACpB,IAAI,iBAAiB,EAAE,CAAC;oBACtB,cAAc,CAAC,KAAK,CAAC,uBAAuB,EAAE;wBAC5C,IAAI,EAAE,aAAa;wBACnB,IAAI,EAAE,QAAQ;wBACd,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;qBAC9D,CAAC,CAAC;gBACL,CAAC;gBACD,OAAO;oBACL,MAAM,EAAE,QAAQ;oBAChB,MAAM,EAAE,KAAK,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC;iBACvC,CAAC;YACJ,CAAC;QACH,CAAC;QAED,KAAK,CAAC,UAAU,CAAC,SAAgE;YAC/E,MAAM,iBAAiB,GAAG,eAAe,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;YACzE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;YACrC,MAAM,GAAG,GAAG,gBAAgB,EAAE,MAAM,EAAE,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YACxD,MAAM,UAAU,GAAG,gBAAgB,EAAE,aAAa,EAAE,CAAC;YACrD,MAAM,QAAQ,GAAG,gBAAgB,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,UAAU,CAAC;YAE9D,IAAI,CAAC;gBACH,oEAAoE;gBACpE,6EAA6E;gBAC7E,0EAA0E;gBAC1E,MAAM,UAAU,GAAG,oBAAoB,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAC;gBAExF,IAAI,iBAAiB,EAAE,CAAC;oBACtB,cAAc,CAAC,KAAK,CAAC,qCAAqC,EAAE;wBAC1D,IAAI,EAAE,QAAQ;wBACd,UAAU;qBACX,CAAC,CAAC;gBACL,CAAC;gBAED,IAAI,QAAQ,IAAI,UAAU,EAAE,CAAC;oBAC3B,yDAAyD;oBACzD,yEAAyE;oBACzE,yCAAyC;oBACzC,MAAM,UAAU,CAAC,cAAc,CAAC,UAAU,UAAU,GAAG,CAAC,CAAC;gBAC3D,CAAC;qBAAM,CAAC;oBACN,MAAM,EAAE,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBACxC,CAAC;gBAED,IAAI,iBAAiB,EAAE,CAAC;oBACtB,cAAc,CAAC,KAAK,CAAC,cAAc,EAAE;wBACnC,IAAI,EAAE,QAAQ;wBACd,UAAU;qBACX,CAAC,CAAC;gBACL,CAAC;gBAED,OAAO;oBACL,MAAM,EAAE,WAAW;oBACnB,MAAM,EAAE,WAAW,QAAQ,EAAE;iBAC9B,CAAC;YACJ,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACpB,IAAI,iBAAiB,EAAE,CAAC;oBACtB,cAAc,CAAC,KAAK,CAAC,uBAAuB,EAAE;wBAC5C,IAAI,EAAE,aAAa;wBACnB,IAAI,EAAE,QAAQ;wBACd,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;qBAC9D,CAAC,CAAC;gBACL,CAAC;gBACD,OAAO;oBACL,MAAM,EAAE,QAAQ;oBAChB,MAAM,EAAE,KAAK,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC;iBACvC,CAAC;YACJ,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/lib/harness-invariant-error.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Raised by a tool when its own preconditions are violated — a bug in this
+ * application, not something the model did wrong.
+ *
+ * Every other tool failure is reported back to the model as tool output so it
+ * can correct its arguments or route around the problem. That default is wrong
+ * for invariant violations: the model has no useful next action, and quietly
+ * handing it an internal error invites a pointless retry. Throwing this type
+ * instead fails the run loudly, which is what a harness bug deserves.
+ *
+ * The distinction is only knowable where the error is raised. The run loop
+ * catches an `Error` and cannot tell a bad search path from a broken
+ * precondition, so tools have to say which one it is.
+ */
+export declare class HarnessInvariantError extends Error {
+    readonly code = "harness_invariant";
+    constructor(message: string);
+}
+export declare function isHarnessInvariantError(error: unknown): error is HarnessInvariantError;
+/** Cancellation is the run ending on purpose; it must never become tool output. */
+export declare function isCancellationError(error: unknown): boolean;
+//# sourceMappingURL=harness-invariant-error.d.ts.map

package/dist/lib/harness-invariant-error.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"harness-invariant-error.d.ts","sourceRoot":"","sources":["../../source/lib/harness-invariant-error.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,qBAAa,qBAAsB,SAAQ,KAAK;IAC9C,QAAQ,CAAC,IAAI,uBAAuB;IAEpC,YAAY,OAAO,EAAE,MAAM,EAG1B;CACF;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,qBAAqB,CAEtF;AAED,mFAAmF;AACnF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAG3D"}

package/dist/lib/harness-invariant-error.js

@@ -0,0 +1,30 @@
+/**
+ * Raised by a tool when its own preconditions are violated — a bug in this
+ * application, not something the model did wrong.
+ *
+ * Every other tool failure is reported back to the model as tool output so it
+ * can correct its arguments or route around the problem. That default is wrong
+ * for invariant violations: the model has no useful next action, and quietly
+ * handing it an internal error invites a pointless retry. Throwing this type
+ * instead fails the run loudly, which is what a harness bug deserves.
+ *
+ * The distinction is only knowable where the error is raised. The run loop
+ * catches an `Error` and cannot tell a bad search path from a broken
+ * precondition, so tools have to say which one it is.
+ */
+export class HarnessInvariantError extends Error {
+    code = 'harness_invariant';
+    constructor(message) {
+        super(message);
+        this.name = 'HarnessInvariantError';
+    }
+}
+export function isHarnessInvariantError(error) {
+    return error instanceof HarnessInvariantError || error?.code === 'harness_invariant';
+}
+/** Cancellation is the run ending on purpose; it must never become tool output. */
+export function isCancellationError(error) {
+    const name = error?.name;
+    return name === 'AbortError' || name === 'TimeoutError';
+}
+//# sourceMappingURL=harness-invariant-error.js.map

package/dist/lib/harness-invariant-error.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"harness-invariant-error.js","sourceRoot":"","sources":["../../source/lib/harness-invariant-error.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,MAAM,OAAO,qBAAsB,SAAQ,KAAK;IACrC,IAAI,GAAG,mBAAmB,CAAC;IAEpC,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,uBAAuB,CAAC;IACtC,CAAC;CACF;AAED,MAAM,UAAU,uBAAuB,CAAC,KAAc;IACpD,OAAO,KAAK,YAAY,qBAAqB,IAAK,KAAmC,EAAE,IAAI,KAAK,mBAAmB,CAAC;AACtH,CAAC;AAED,mFAAmF;AACnF,MAAM,UAAU,mBAAmB,CAAC,KAAc;IAChD,MAAM,IAAI,GAAI,KAAmC,EAAE,IAAI,CAAC;IACxD,OAAO,IAAI,KAAK,YAAY,IAAI,IAAI,KAAK,cAAc,CAAC;AAC1D,CAAC"}

package/dist/lib/input-owner.d.ts

@@ -0,0 +1,64 @@
+/**
+ * Single source of truth for "which surface owns keyboard input right now."
+ *
+ * Ink fans every keypress out to ALL mounted `useInput` hooks. To prevent an
+ * app-level shortcut (e.g. Esc → stopProcessing) from firing while a modal
+ * confirmation prompt owns the interaction, the app keyboard-shortcuts hook
+ * gates itself on `inputOwner.kind === 'input'`.
+ *
+ * The derivation intentionally mirrors the mutual-exclusivity ordering used by
+ * `BottomArea` when deciding which prompt to render, so "who owns input" stays
+ * in sync with "what is rendered".
+ *
+ * Adding a new modal prompt: add a variant to `InputOwner`, handle it here in
+ * `deriveInputOwner`, and ensure it returns a non-`'input'` kind so the app hook
+ * stays suppressed while that prompt is shown.
+ */
+export type InputOwner = {
+    kind: 'handoff-confirm';
+} | {
+    kind: 'standard-mode-confirm';
+} | {
+    kind: 'input-surge';
+} | {
+    kind: 'large-uncached';
+} | {
+    kind: 'approval';
+} | {
+    kind: 'queue-paused';
+} | {
+    kind: 'background-tasks';
+} | {
+    kind: 'menu';
+} | {
+    kind: 'input';
+};
+export type InputOwnerState = {
+    handoffStage?: string | null;
+    pendingSurgeTurn: unknown | null;
+    pendingLargeUncachedTurn: unknown | null;
+    waitingForApproval: boolean;
+    waitingForRejectionReason: boolean;
+    waitingForAskUserAnswer: boolean;
+    pendingApproval: unknown | null;
+    queuePaused: boolean;
+    backgroundTaskManagerOpen?: boolean;
+    menuOpen?: boolean;
+    /**
+     * True while the agent is actively processing a turn. Mirrors the original
+     * `showApprovalPrompt` guard: the approval prompt only owns input when NOT
+     * processing (otherwise no surface owns input).
+     */
+    isProcessing: boolean;
+};
+/**
+ * Resolve which surface owns input from the current effective app state.
+ *
+ * Ordering matters: the four standalone confirmation prompts are mutually
+ * exclusive (see `BottomArea`'s render chain), and `approval` is only the
+ * owner when an approval decision is actually pending — NOT during
+ * ask-user-answer or rejection-reason sub-modes, where `InputBox` owns input
+ * and the app hook must stay active to cancel those sub-modes on Esc.
+ */
+export declare const deriveInputOwner: (state: InputOwnerState) => InputOwner;
+//# sourceMappingURL=input-owner.d.ts.map

package/dist/lib/input-owner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"input-owner.d.ts","sourceRoot":"","sources":["../../source/lib/input-owner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,MAAM,MAAM,UAAU,GAClB;IAAE,IAAI,EAAE,iBAAiB,CAAA;CAAE,GAC3B;IAAE,IAAI,EAAE,uBAAuB,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GACvB;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,GACpB;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,GACxB;IAAE,IAAI,EAAE,kBAAkB,CAAA;CAAE,GAC5B;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAEtB,MAAM,MAAM,eAAe,GAAG;IAC5B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,gBAAgB,EAAE,OAAO,GAAG,IAAI,CAAC;IACjC,wBAAwB,EAAE,OAAO,GAAG,IAAI,CAAC;IACzC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,yBAAyB,EAAE,OAAO,CAAC;IACnC,uBAAuB,EAAE,OAAO,CAAC;IACjC,eAAe,EAAE,OAAO,GAAG,IAAI,CAAC;IAChC,WAAW,EAAE,OAAO,CAAC;IACrB,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;OAIG;IACH,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,gBAAgB,UAAW,eAAe,KAAG,UAkBzD,CAAC"}

package/dist/lib/input-owner.js

@@ -0,0 +1,34 @@
+/**
+ * Resolve which surface owns input from the current effective app state.
+ *
+ * Ordering matters: the four standalone confirmation prompts are mutually
+ * exclusive (see `BottomArea`'s render chain), and `approval` is only the
+ * owner when an approval decision is actually pending — NOT during
+ * ask-user-answer or rejection-reason sub-modes, where `InputBox` owns input
+ * and the app hook must stay active to cancel those sub-modes on Esc.
+ */
+export const deriveInputOwner = (state) => {
+    if (state.handoffStage === 'confirm_model')
+        return { kind: 'handoff-confirm' };
+    if (state.handoffStage === 'confirm_standard_mode')
+        return { kind: 'standard-mode-confirm' };
+    if (state.pendingSurgeTurn)
+        return { kind: 'input-surge' };
+    if (state.pendingLargeUncachedTurn)
+        return { kind: 'large-uncached' };
+    if (state.waitingForApproval &&
+        !state.isProcessing &&
+        !state.waitingForRejectionReason &&
+        !state.waitingForAskUserAnswer &&
+        state.pendingApproval) {
+        return { kind: 'approval' };
+    }
+    if (state.menuOpen)
+        return { kind: 'menu' };
+    if (state.queuePaused)
+        return { kind: 'queue-paused' };
+    if (state.backgroundTaskManagerOpen)
+        return { kind: 'background-tasks' };
+    return { kind: 'input' };
+};
+//# sourceMappingURL=input-owner.js.map

package/dist/lib/input-owner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"input-owner.js","sourceRoot":"","sources":["../../source/lib/input-owner.ts"],"names":[],"mappings":"AA8CA;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAAsB,EAAc,EAAE;IACrE,IAAI,KAAK,CAAC,YAAY,KAAK,eAAe;QAAE,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;IAC/E,IAAI,KAAK,CAAC,YAAY,KAAK,uBAAuB;QAAE,OAAO,EAAE,IAAI,EAAE,uBAAuB,EAAE,CAAC;IAC7F,IAAI,KAAK,CAAC,gBAAgB;QAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;IAC3D,IAAI,KAAK,CAAC,wBAAwB;QAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;IACtE,IACE,KAAK,CAAC,kBAAkB;QACxB,CAAC,KAAK,CAAC,YAAY;QACnB,CAAC,KAAK,CAAC,yBAAyB;QAChC,CAAC,KAAK,CAAC,uBAAuB;QAC9B,KAAK,CAAC,eAAe,EACrB,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IAC9B,CAAC;IACD,IAAI,KAAK,CAAC,QAAQ;QAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC5C,IAAI,KAAK,CAAC,WAAW;QAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;IACvD,IAAI,KAAK,CAAC,yBAAyB;QAAE,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;IACzE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;AAC3B,CAAC,CAAC"}

package/dist/lib/openai-strict-tool-schema.d.ts

@@ -1,10 +1,13 @@
-import { z } from 'zod';
-type AnyZodObject = z.ZodObject<any, any>;
+import { type ZodTypeAny } from 'zod';
 /**
  * OpenAI strict tool schemas require every property to be listed in `required`.
  * To keep tool definitions ergonomic (optional params), we convert optional fields
  * into nullable fields with a null default only for OpenAI tool registration.
+ *
+ * The parameter type is the full `ZodTypeAny` family (not just `ZodObject`)
+ * because the tool contract erases `parameters` to `ZodTypeAny` in its
+ * heterogeneous registry; non-object schemas cannot be converted and are passed
+ * through unchanged (all current tool parameter schemas are objects).
  */
-export declare const toOpenAIStrictToolSchema: <T extends AnyZodObject>(schema: T) => AnyZodObject;
-export {};
+export declare const toOpenAIStrictToolSchema: <T extends ZodTypeAny>(schema: T) => ZodTypeAny;
 //# sourceMappingURL=openai-strict-tool-schema.d.ts.map

package/dist/lib/openai-strict-tool-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai-strict-tool-schema.d.ts","sourceRoot":"","sources":["../../source/lib/openai-strict-tool-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,KAAK,YAAY,GAAG,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAI1C;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,GAAI,CAAC,SAAS,YAAY,UAAU,CAAC,KAAG,YAqC5E,CAAC"}
+{"version":3,"file":"openai-strict-tool-schema.d.ts","sourceRoot":"","sources":["../../source/lib/openai-strict-tool-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAK,KAAK,UAAU,EAAE,MAAM,KAAK,CAAC;AAIzC;;;;;;;;;GASG;AACH,eAAO,MAAM,wBAAwB,GAAI,CAAC,SAAS,UAAU,UAAU,CAAC,KAAG,UAwC1E,CAAC"}

package/dist/lib/openai-strict-tool-schema.js

@@ -4,8 +4,16 @@ const isZodOptional = (schema) => schema instanceof z.ZodOptional;
  * OpenAI strict tool schemas require every property to be listed in `required`.
  * To keep tool definitions ergonomic (optional params), we convert optional fields
  * into nullable fields with a null default only for OpenAI tool registration.
+ *
+ * The parameter type is the full `ZodTypeAny` family (not just `ZodObject`)
+ * because the tool contract erases `parameters` to `ZodTypeAny` in its
+ * heterogeneous registry; non-object schemas cannot be converted and are passed
+ * through unchanged (all current tool parameter schemas are objects).
  */
 export const toOpenAIStrictToolSchema = (schema) => {
+    if (!(schema instanceof z.ZodObject)) {
+        return schema;
+    }
     const shape = schema.shape;
     const nextShape = {};
     let changed = false;

package/dist/lib/openai-strict-tool-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"openai-strict-tool-schema.js","sourceRoot":"","sources":["../../source/lib/openai-strict-tool-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,MAAM,aAAa,GAAG,CAAC,MAAoB,EAAgC,EAAE,CAAC,MAAM,YAAY,CAAC,CAAC,WAAW,CAAC;AAE9G;;;;GAIG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAyB,MAAS,EAAgB,EAAE;IAC1F,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IAC3B,MAAM,SAAS,GAAiC,EAAE,CAAC;IACnD,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACjD,MAAM,KAAK,GAAG,KAAqB,CAAC;QACpC,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,GAAG,IAAI,CAAC;YACf,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;YACtC,IAAI,WAAW,GAAiB,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACxE,IAAI,WAAW,EAAE,CAAC;gBAChB,WAAW,GAAG,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAClD,CAAC;YACD,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC;YAC7B,SAAS;QACX,CAAC;QAED,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACzB,CAAC;IAED,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACnC,MAAM,GAAG,GAAS,MAAc,CAAC,IAAI,CAAC;IAEtC,IAAI,GAAG,EAAE,WAAW,KAAK,aAAa,EAAE,CAAC;QACvC,OAAO,MAAM,CAAC,WAAW,EAAE,CAAC;IAC9B,CAAC;IAED,IAAI,GAAG,EAAE,WAAW,KAAK,QAAQ,EAAE,CAAC;QAClC,OAAO,MAAM,CAAC,MAAM,EAAE,CAAC;IACzB,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
+{"version":3,"file":"openai-strict-tool-schema.js","sourceRoot":"","sources":["../../source/lib/openai-strict-tool-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAmB,MAAM,KAAK,CAAC;AAEzC,MAAM,aAAa,GAAG,CAAC,MAAoB,EAAgC,EAAE,CAAC,MAAM,YAAY,CAAC,CAAC,WAAW,CAAC;AAE9G;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAuB,MAAS,EAAc,EAAE;IACtF,IAAI,CAAC,CAAC,MAAM,YAAY,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;QACrC,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IAC3B,MAAM,SAAS,GAAiC,EAAE,CAAC;IACnD,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACjD,MAAM,KAAK,GAAG,KAAqB,CAAC;QACpC,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,GAAG,IAAI,CAAC;YACf,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;YACtC,IAAI,WAAW,GAAiB,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACxE,IAAI,WAAW,EAAE,CAAC;gBAChB,WAAW,GAAG,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAClD,CAAC;YACD,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC;YAC7B,SAAS;QACX,CAAC;QAED,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACzB,CAAC;IAED,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACnC,MAAM,GAAG,GAAI,MAAgE,CAAC,IAAI,CAAC;IAEnF,IAAI,GAAG,EAAE,WAAW,KAAK,aAAa,EAAE,CAAC;QACvC,OAAO,MAAM,CAAC,WAAW,EAAE,CAAC;IAC9B,CAAC;IAED,IAAI,GAAG,EAAE,WAAW,KAAK,QAAQ,EAAE,CAAC;QAClC,OAAO,MAAM,CAAC,MAAM,EAAE,CAAC;IACzB,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/dist/lib/subagent-bridge.d.ts

@@ -2,10 +2,14 @@ import { SubagentManager } from '../services/subagents/subagent-manager.js';
 import type { ConversationEvent } from '../services/conversation/conversation-events.js';
 import type { ILoggingService, ISettingsService, ISessionContextService } from '../services/service-interfaces.js';
 import type { ExecutionContext } from '../services/execution-context.js';
-import type { SubagentResult } from '../services/subagents/types.js';
+import type { NestedSubagentResult, SubagentCancelAcknowledgement, SubagentResult, SubagentRunStatus, SubagentSteerAcknowledgement } from '../services/subagents/types.js';
 import type { AgentRuntime } from '../services/agent-runtime/agent-runtime.js';
 import type { SkillsService } from '../services/skills/skills-service.js';
 import type { SubagentRunHandle } from '../services/subagents/types.js';
+import type { ToolOwnershipRegistry } from '../services/approval/tool-ownership-registry.js';
+import type { BackgroundSubagentApprovalPauseSink } from '../services/subagents/foreground-subagent-lease.js';
+import type { ForegroundSubagentCandidate } from '../services/subagents/nested-runner.js';
+import type { NestedToolCompatibilityState } from '../services/session/nested-tool-compatibility-state.js';
 export interface SubagentBridgeDeps {
     logger: ILoggingService;
     settings: ISettingsService;
@@ -26,6 +30,9 @@ export interface SubagentBridgeDeps {
      */
     subagentManager?: SubagentManager;
     skillsService?: SkillsService;
+    toolOwnership: ToolOwnershipRegistry;
+    /** Session-owned delivery path for approvals after foreground adoption. */
+    backgroundApprovalPauseSink?: BackgroundSubagentApprovalPauseSink;
 }
 export declare class SubagentBridge {
     #private;
@@ -38,6 +45,17 @@ export declare class SubagentBridge {
      * instead of being buffered until the next turn attaches a sink.
      */
     setBackgroundEventSink(sink: ((event: ConversationEvent) => void) | null): void;
+    /** Installs the session-owned adopted-subagent approval pause sink. */
+    setBackgroundApprovalPauseSink(sink: BackgroundSubagentApprovalPauseSink | null): void;
+    /** Exact nested-tool compatibility state from the manager's live runtime. */
+    getNestedToolCompatibilityState(): NestedToolCompatibilityState | undefined;
+    /** End session-scoped subagent work and release its event sinks and caches. */
+    dispose(): void;
+    /**
+     * Cancels and awaits adopted foreground leases without detaching either
+     * event sink. The caller controls sink teardown after this promise settles.
+     */
+    disposeBackgroundSubagents(): Promise<void>;
     /**
      * Obtain an AgentRuntime backed by this bridge's SubagentManager.
      * This is the stable production boundary for creating and running
@@ -73,15 +91,48 @@ export declare class SubagentBridge {
     runSubagent: (params: {
         role: string;
         task: string;
-    }, _context?: unknown, details?: unknown) => Promise<SubagentResult>;
+    }, _context?: unknown, details?: unknown) => Promise<NestedSubagentResult>;
     runSubagentAsync: (params: {
         role: string;
         task: string;
+        name?: string;
         continue_run_id?: string;
-    }, _context?: unknown, details?: unknown) => Promise<SubagentRunHandle>;
+    }, _context?: unknown, _details?: unknown) => Promise<SubagentRunHandle>;
     getSubagentResult: (params: {
         runId: string;
     }, _context?: unknown, details?: unknown) => Promise<SubagentResult>;
+    /**
+     * Non-blocking peek: progress snapshot for one run (runId provided) or all
+     * non-evicted runs (runId omitted). Never awaits; never carries completion
+     * detail. Throws only when the bridge has no manager (transient clients).
+     */
+    getSubagentStatus: (params: {
+        runId?: string;
+    }, _context?: unknown, _details?: unknown) => SubagentRunStatus | SubagentRunStatus[];
+    /** Root-session control seam for one background run's live or retained status. */
+    getBackgroundSubagentStatus(runId: string): SubagentRunStatus;
+    /** Root-session control seam listing registry-retained runs, live entries first. */
+    listBackgroundSubagentStatuses(): SubagentRunStatus[];
+    /** Parent-only non-blocking control for active async execution runs. */
+    sendSubagentMessage: (params: {
+        target: string;
+        message: string;
+        reply_to?: string | null;
+    }) => SubagentSteerAcknowledgement;
+    /** Parent-only non-blocking two-phase cancellation by runId or active name. */
+    cancelSubagentRun: (params: {
+        target: string;
+    }) => SubagentCancelAcknowledgement;
+    /** Root-session control seam for stopping one canonical background run id. */
+    requestBackgroundSubagentStop(runId: string): SubagentCancelAcknowledgement;
+    /**
+     * Minimal session-control seam for a later task manager. Successful moves
+     * switch event routing through the registry's async started event; no UI or
+     * approval policy is coupled here.
+     */
+    moveForegroundSubagent(runId: string): SubagentRunHandle | undefined;
+    /** Observational candidates for foreground-to-background transfer controls. */
+    listForegroundSubagentCandidates(): ForegroundSubagentCandidate[];
     abortAsyncRun: (runId: string) => void;
     resetAsyncRuns: () => void;
     /** @deprecated Ordinary turns do not cancel async runs. */

package/dist/lib/subagent-bridge.d.ts.map

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

package/dist/lib/subagent-bridge.js

@@ -1,13 +1,14 @@
+import { randomUUID } from 'node:crypto';
 import { SubagentManager } from '../services/subagents/subagent-manager.js';
 import { createAbortError } from '../services/subagents/utils.js';
 export class SubagentBridge {
     #subagentManager;
+    #isDisposed = false;
     #sessionContextService;
     #subagentEventSink = null;
     #backgroundEventSink = null;
     #backgroundRunIds = new Set();
     #activeSubagentsCount = 0;
-    #pendingClearSink = false;
     #bufferedEvents = [];
     #logger;
     /** Per-turn scope: foreground subagent work belonging to the running turn. */
@@ -33,12 +34,13 @@ export class SubagentBridge {
                 agentClient: { chat: (message, options) => deps.chat(message, options) },
                 createClient: deps.createClient,
                 skillsService: deps.skillsService,
+                toolOwnership: deps.toolOwnership,
+                ...(deps.backgroundApprovalPauseSink ? { backgroundApprovalPauseSink: deps.backgroundApprovalPauseSink } : {}),
             });
         }
     }
     setEventSink(sink) {
         this.#subagentEventSink = sink;
-        this.#pendingClearSink = false;
         if (sink)
             this.#flushBufferedEvents('foreground', sink);
     }
@@ -53,6 +55,38 @@ export class SubagentBridge {
         if (sink)
             this.#flushBufferedEvents('background', sink);
     }
+    /** Installs the session-owned adopted-subagent approval pause sink. */
+    setBackgroundApprovalPauseSink(sink) {
+        this.#subagentManager?.setBackgroundApprovalPauseSink(sink ?? undefined);
+    }
+    /** Exact nested-tool compatibility state from the manager's live runtime. */
+    getNestedToolCompatibilityState() {
+        return this.#subagentManager?.getNestedToolCompatibilityState();
+    }
+    /** End session-scoped subagent work and release its event sinks and caches. */
+    dispose() {
+        if (this.#isDisposed)
+            return;
+        this.#isDisposed = true;
+        this.#abortController.abort();
+        this.#backgroundAbortController.abort();
+        this.#subagentManager?.cancelAllAsyncRuns();
+        this.#subagentManager?.clearCache();
+        this.#subagentManager?.resetMentorSession();
+        this.#subagentManager?.dispose();
+        this.#subagentManager = null;
+        this.#subagentEventSink = null;
+        this.#backgroundEventSink = null;
+        this.#backgroundRunIds.clear();
+        this.#bufferedEvents = [];
+    }
+    /**
+     * Cancels and awaits adopted foreground leases without detaching either
+     * event sink. The caller controls sink teardown after this promise settles.
+     */
+    disposeBackgroundSubagents() {
+        return this.#subagentManager?.disposeAsync() ?? Promise.resolve();
+    }
     #flushBufferedEvents(scope, sink) {
         const pending = [];
         for (const buffered of this.#bufferedEvents) {
@@ -66,6 +100,8 @@ export class SubagentBridge {
         this.#bufferedEvents = pending;
     }
     #emitEvent(event) {
+        if (this.#isDisposed)
+            return;
         const agentId = event.type === 'subagent_completed'
             ? event.result.agentId
             : 'agentId' in event && typeof event.agentId === 'string'
@@ -141,26 +177,34 @@ export class SubagentBridge {
         this.#subagentManager?.cancelAllAsyncRuns();
         this.#backgroundAbortController = new AbortController();
     }
-    /** Increment active count and return a disposer that decrements + handles pending sink clear */
+    /** Increment active count and return a disposer that decrements it */
     #beginSubagentRun() {
         this.#activeSubagentsCount++;
         return () => {
             this.#activeSubagentsCount--;
-            if (this.#pendingClearSink && this.#activeSubagentsCount === 0) {
-                this.#subagentEventSink = null;
-                this.#pendingClearSink = false;
-            }
         };
     }
-    #withSubagentTrafficContext(toolCallId, fn) {
+    /**
+     * Runs `fn` under a traffic context whose provider history key identifies the
+     * subagent run rather than the conversation that launched it. Providers key
+     * server-side state off this — an OpenCode session, a Codex response chain —
+     * so a run that reuses the parent's key writes its turns into the parent's
+     * history.
+     *
+     * `runScope` identifies the run: a tool call ID, or `mentor` for the mentor
+     * session that persists across consultations. It is appended to the current
+     * key so a nested subagent scopes under its parent rather than flattening
+     * back onto the conversation. Without one, a random scope is used: a fresh,
+     * unshared history is a safer default than silently sharing the parent's.
+     */
+    #withSubagentTrafficContext(runScope, fn) {
         const currentContext = this.#sessionContextService.getContext();
         if (!currentContext) {
             return fn();
         }
-        return this.#sessionContextService.runWithContext({
-            ...currentContext,
-            ...(toolCallId ? { providerHistoryKey: `${currentContext.sessionId}:subagent:${toolCallId}` } : {}),
-        }, fn);
+        const parentKey = currentContext.providerHistoryKey ?? currentContext.sessionId;
+        const scope = runScope ?? randomUUID();
+        return this.#sessionContextService.runWithContext({ ...currentContext, providerHistoryKey: `${parentKey}:subagent:${scope}` }, fn);
     }
     createMentor = async (question) => {
         if (!this.#subagentManager) {
@@ -168,7 +212,9 @@ export class SubagentBridge {
         }
         const endRun = this.#beginSubagentRun();
         try {
-            const result = await this.#withSubagentTrafficContext(undefined, () => this.#subagentManager.run({
+            // The mentor session outlives a single consultation (see
+            // `resetMentorSession`), so its scope is the role, not the call.
+            const result = await this.#withSubagentTrafficContext('mentor', () => this.#subagentManager.run({
                 role: 'mentor',
                 task: question,
                 parentTool: 'ask_mentor',
@@ -212,24 +258,25 @@ export class SubagentBridge {
             endRun();
         }
     };
-    runSubagentAsync = async (params, _context, details) => {
+    runSubagentAsync = async (params, _context, _details) => {
         if (!this.#subagentManager) {
             throw new Error('Transient agent clients cannot spawn subagents.');
         }
-        const detailsRecord = details;
         const request = {
             role: params.role,
             task: params.task,
+            ...(params.name ? { name: params.name } : {}),
             ...(params.continue_run_id ? { continueRunId: params.continue_run_id } : {}),
-            parentTool: 'run_subagent_async',
+            parentTool: 'run_subagent',
             // Conversation-scoped, not per-turn: this run must survive the turn that
             // launched it and every ordinary abort.
             signal: this.backgroundSignal,
         };
-        return this.#withSubagentTrafficContext(detailsRecord?.toolCall?.callId, () => {
-            const handle = this.#subagentManager.startRunAsync(request);
-            return handle;
-        });
+        // Deliberately not scoped here: a background run outlives the tool call that
+        // launched it and can be continued from a later one, so only the registry —
+        // which owns the run ID — can give every segment one stable scope. See
+        // `SubagentAsyncRegistry`'s `trafficContext`.
+        return this.#subagentManager.startRunAsync(request);
     };
     getSubagentResult = async (params, _context, details) => {
         if (!this.#subagentManager) {
@@ -238,6 +285,57 @@ export class SubagentBridge {
         const detailsRecord = details;
         return this.#subagentManager.getRunResult(params.runId, detailsRecord?.signal);
     };
+    /**
+     * Non-blocking peek: progress snapshot for one run (runId provided) or all
+     * non-evicted runs (runId omitted). Never awaits; never carries completion
+     * detail. Throws only when the bridge has no manager (transient clients).
+     */
+    getSubagentStatus = (params, _context, _details) => {
+        if (!this.#subagentManager) {
+            throw new Error('Transient agent clients cannot get subagent status.');
+        }
+        return this.#subagentManager.getRunStatus(params.runId);
+    };
+    /** Root-session control seam for one background run's live or retained status. */
+    getBackgroundSubagentStatus(runId) {
+        return this.getSubagentStatus({ runId });
+    }
+    /** Root-session control seam listing registry-retained runs, live entries first. */
+    listBackgroundSubagentStatuses() {
+        return this.getSubagentStatus({});
+    }
+    /** Parent-only non-blocking control for active async execution runs. */
+    sendSubagentMessage = (params) => {
+        if (!this.#subagentManager) {
+            throw new Error('Transient agent clients cannot control asynchronous subagents.');
+        }
+        return this.#subagentManager.sendMessageToAsyncRun(params);
+    };
+    /** Parent-only non-blocking two-phase cancellation by runId or active name. */
+    cancelSubagentRun = (params) => {
+        if (!this.#subagentManager) {
+            throw new Error('Transient agent clients cannot control asynchronous subagents.');
+        }
+        return this.#subagentManager.cancelAsyncRun(params.target);
+    };
+    /** Root-session control seam for stopping one canonical background run id. */
+    requestBackgroundSubagentStop(runId) {
+        return this.cancelSubagentRun({ target: runId });
+    }
+    /**
+     * Minimal session-control seam for a later task manager. Successful moves
+     * switch event routing through the registry's async started event; no UI or
+     * approval policy is coupled here.
+     */
+    moveForegroundSubagent(runId) {
+        if (!this.#subagentManager)
+            throw new Error('Transient agent clients cannot move subagents.');
+        return this.#subagentManager.moveForegroundSubagent(runId);
+    }
+    /** Observational candidates for foreground-to-background transfer controls. */
+    listForegroundSubagentCandidates() {
+        return this.#subagentManager?.listForegroundSubagentCandidates() ?? [];
+    }
     abortAsyncRun = (runId) => {
         this.#subagentManager?.abortAsyncRun(runId);
     };