@nimbus-sh/worker 0.10.0 → 0.11.0

package/dist/workspace-host.d.ts

@@ -1,6 +1,8 @@
 export { composeFacetManager, type FacetManagerDeps, type FacetManagerHostHooks, type ComposedFacetManager } from './facets/compose.js';
 export type { WorkerRecipe, ResolvedWorkerLaunch, LongRunningWorkerSpawnOptions } from './facets/manager.js';
 export { composeHostedRuntime, type HostedRuntime, type HostedRuntimeOptions, type HostedRuntimeLifecycle, type HostedRuntimeTask, type RuntimeFiles } from './hosted/runtime.js';
+export { HostedSession, type HostedSessionScope } from './hosted/session.js';
+export { collectExecStream, decodeExecStream, encodeExecStream, type ExecChunk, type ExecExit, type ExecOutput, type ExecStream, type ExecStreamName } from '@nimbus-sh/core/runtime/exec-stream.js';
 export { runtimeCatalogSource } from './runtime/runtime-catalog.js';
 export { SupervisorRPC } from './session/supervisor-rpc.js';
 export { NimbusAssetsRPC, NimbusLoaderRPC, NimbusLoadedWorker, NimbusLoadedEntrypoint, NimbusDurableObjectNamespace, NimbusDOStub } from '@nimbus-sh/fabric/bindings.js';

package/dist/workspace-host.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-host.d.ts","sourceRoot":"","sources":["../src/workspace-host.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,KAAK,gBAAgB,EAAE,KAAK,qBAAqB,EAAE,KAAK,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AACxI,YAAY,EAAE,YAAY,EAAE,oBAAoB,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AAC7G,OAAO,EAAE,oBAAoB,EAAE,KAAK,aAAa,EAAE,KAAK,oBAAoB,EAAE,KAAK,sBAAsB,EAAE,KAAK,iBAAiB,EAAE,KAAK,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAClL,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,4BAA4B,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC"}
+{"version":3,"file":"workspace-host.d.ts","sourceRoot":"","sources":["../src/workspace-host.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,KAAK,gBAAgB,EAAE,KAAK,qBAAqB,EAAE,KAAK,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AACxI,YAAY,EAAE,YAAY,EAAE,oBAAoB,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AAC7G,OAAO,EAAE,oBAAoB,EAAE,KAAK,aAAa,EAAE,KAAK,oBAAoB,EAAE,KAAK,sBAAsB,EAAE,KAAK,iBAAiB,EAAE,KAAK,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAClL,OAAO,EAAE,aAAa,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAE,KAAK,UAAU,EAAE,KAAK,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACrM,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,4BAA4B,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC"}

package/dist/workspace-host.js

@@ -1,5 +1,7 @@
 export { composeFacetManager } from './facets/compose.js';
 export { composeHostedRuntime } from './hosted/runtime.js';
+export { HostedSession } from './hosted/session.js';
+export { collectExecStream, decodeExecStream, encodeExecStream } from '@nimbus-sh/core/runtime/exec-stream.js';
 export { runtimeCatalogSource } from './runtime/runtime-catalog.js';
 export { SupervisorRPC } from './session/supervisor-rpc.js';
 export { NimbusAssetsRPC, NimbusLoaderRPC, NimbusLoadedWorker, NimbusLoadedEntrypoint, NimbusDurableObjectNamespace, NimbusDOStub } from '@nimbus-sh/fabric/bindings.js';

package/dist/wrangler/nimbus-wrangler.d.ts

@@ -69,8 +69,6 @@ export declare class NimbusWrangler {
     private rebuildTimer;
     /** DO class map: binding name → DurableObjectClass from the inner worker. */
     private doClassMap;
-    /** Facet names we've created via ctx.facets.get — aborted on rebuild / stop. */
-    private doFacetNames;
     constructor(opts: NimbusWranglerOptions);
     /** Start the wrangler dev server. */
     start(): Promise<boolean>;

package/dist/wrangler/nimbus-wrangler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nimbus-wrangler.d.ts","sourceRoot":"","sources":["../../src/wrangler/nimbus-wrangler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AACjF,OAAO,KAAK,EAAY,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAqD/E,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,eAAe,CAAC;IACrB,SAAS,EAAE,eAAe,CAAC;IAC3B,OAAO,EAAE,cAAc,CAAC;IACxB,GAAG,EAAE,GAAG,CAAC;IACT;;;;OAIG;IACH,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,YAAY,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;CAClC;AAID;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,EACvB,iBAAiB,EAAE,MAAM,GACxB,MAAM,CA+BR;AAyDD,qBAAa,cAAc;IACzB,OAAO,CAAC,GAAG,CAAkB;IAC7B,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,SAAS,CAAM;IACvB,OAAO,CAAC,aAAa,CAAM;IAC3B,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,KAAK,CAAwB;IACrC,OAAO,CAAC,YAAY,CAAqB;IAEzC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,MAAM,CAA+B;IAC7C,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,YAAY,CAAK;IACzB,OAAO,CAAC,QAAQ,CAA6B;IAC7C,OAAO,CAAC,YAAY,CAAa;IACjC,6EAA6E;IAC7E,OAAO,CAAC,UAAU,CAA+B;IACjD,gFAAgF;IAChF,OAAO,CAAC,YAAY,CAA0B;gBAElC,IAAI,EAAE,qBAAqB;IAWvC,qCAAqC;IAC/B,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC;IAqB/B,oCAAoC;IACpC,IAAI,IAAI,IAAI;IAgBZ,IAAI,SAAS,YAA2B;IAIxC,OAAO,CAAC,UAAU;IAiDlB,oFAAoF;IACpF,OAAO,CAAC,gBAAgB;IAqBxB;;;;;;;;;;;;;;;;;;;OAmBG;IACH,OAAO,CAAC,gBAAgB;YAIV,YAAY;IA6L1B,OAAO,CAAC,aAAa;IAwOrB,OAAO,CAAC,eAAe;IAkCvB;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACG,aAAa,CACjB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM;IAChB;;;;;OAKG;IACH,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,QAAQ,CAAC;IAsFpB,IAAI,KAAK;;;;;;MAQR;IAYD,8FAA8F;IAC9F,kBAAkB,IAAI,OAAO;IAK7B,+EAA+E;IAC/E,qBAAqB,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAI5C;;;;;gCAK4B;IAC5B,uBAAuB,IAAI,IAAI;CA4BhC"}
+{"version":3,"file":"nimbus-wrangler.d.ts","sourceRoot":"","sources":["../../src/wrangler/nimbus-wrangler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AACjF,OAAO,KAAK,EAAY,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAqD/E,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,eAAe,CAAC;IACrB,SAAS,EAAE,eAAe,CAAC;IAC3B,OAAO,EAAE,cAAc,CAAC;IACxB,GAAG,EAAE,GAAG,CAAC;IACT;;;;OAIG;IACH,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,YAAY,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;CAClC;AAID;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,EACvB,iBAAiB,EAAE,MAAM,GACxB,MAAM,CA+BR;AAyDD,qBAAa,cAAc;IACzB,OAAO,CAAC,GAAG,CAAkB;IAC7B,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,SAAS,CAAM;IACvB,OAAO,CAAC,aAAa,CAAM;IAC3B,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,KAAK,CAAwB;IACrC,OAAO,CAAC,YAAY,CAAqB;IAEzC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,MAAM,CAA+B;IAC7C,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,YAAY,CAAK;IACzB,OAAO,CAAC,QAAQ,CAA6B;IAC7C,OAAO,CAAC,YAAY,CAAa;IACjC,6EAA6E;IAC7E,OAAO,CAAC,UAAU,CAA+B;gBAErC,IAAI,EAAE,qBAAqB;IAWvC,qCAAqC;IAC/B,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC;IAqB/B,oCAAoC;IACpC,IAAI,IAAI,IAAI;IAaZ,IAAI,SAAS,YAA2B;IAIxC,OAAO,CAAC,UAAU;IAiDlB,oFAAoF;IACpF,OAAO,CAAC,gBAAgB;IAqBxB;;;;;;;;;;;;;;;;;;;OAmBG;IACH,OAAO,CAAC,gBAAgB;YAIV,YAAY;IA2L1B,OAAO,CAAC,aAAa;IAoOrB,OAAO,CAAC,eAAe;IAkCvB;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACG,aAAa,CACjB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM;IAChB;;;;;OAKG;IACH,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,QAAQ,CAAC;IAsFpB,IAAI,KAAK;;;;;;MAQR;IAYD,8FAA8F;IAC9F,kBAAkB,IAAI,OAAO;IAK7B,+EAA+E;IAC/E,qBAAqB,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAI5C;;;;;gCAK4B;IAC5B,uBAAuB,IAAI,IAAI;CA4BhC"}

package/dist/wrangler/nimbus-wrangler.js

@@ -14,7 +14,7 @@
  * Cloudflare Workers runtime, not a simulation.
  */
 import { normalizeVfsPath } from '@nimbus-sh/core/vfs/path.js';
-import { registerInnerDoClass, clearInnerDoClasses } from '@nimbus-sh/fabric/inner-do-registry.js';
+import { registerInnerDoClass, clearInnerDoClasses, abortInnerDoFacets } from '@nimbus-sh/fabric/inner-do-registry.js';
 import { KvEmulator } from '../bindings/kv.js';
 import { D1Emulator } from '../bindings/d1.js';
 import { R2Emulator } from '../bindings/r2.js';
@@ -144,8 +144,6 @@ export class NimbusWrangler {
     rebuildTimer = null;
     /** DO class map: binding name → DurableObjectClass from the inner worker. */
     doClassMap = new Map();
-    /** Facet names we've created via ctx.facets.get — aborted on rebuild / stop. */
-    doFacetNames = new Set();
     constructor(opts) {
         this.vfs = opts.vfs;
         this.vfsEvents = opts.vfsEvents;
@@ -188,15 +186,9 @@ export class NimbusWrangler {
         }
         // Abort live inner-DO facets so their stubs drop. Storage persists per
         // docs — next start() or `nimbus-wrangler reset` controls deletion.
-        if (this.doFacetNames.size > 0 && this.supervisorCtx?.facets?.abort) {
-            for (const name of this.doFacetNames) {
-                try {
-                    this.supervisorCtx.facets.abort(name, new Error('nimbus-wrangler stopped'));
-                }
-                catch { }
-            }
+        if (this.supervisorCtx) {
+            abortInnerDoFacets(this.supervisorCtx, this.doClassMap.keys(), new Error('nimbus-wrangler stopped'));
         }
-        this.doFacetNames.clear();
         this.doClassMap.clear();
         this.workerStub = null;
     }
@@ -395,13 +387,8 @@ export class NimbusWrangler {
             // startup callback with the fresh class. Docs: abort invalidates
             // all existing stubs but preserves storage; the next get() is the
             // code-update pattern.
-            if (this.doFacetNames.size > 0 && this.supervisorCtx?.facets?.abort) {
-                for (const name of this.doFacetNames) {
-                    try {
-                        this.supervisorCtx.facets.abort(name, new Error('nimbus-wrangler rebuilding'));
-                    }
-                    catch { }
-                }
+            if (this.supervisorCtx) {
+                abortInnerDoFacets(this.supervisorCtx, this.doClassMap.keys(), new Error('nimbus-wrangler rebuilding'));
             }
             // Two-pass load to break the chicken-and-egg:
             //   Pass 1: load with NO env to extract any durable_objects classes.
@@ -629,10 +616,6 @@ export class NimbusWrangler {
                             route: hostRoute() ?? undefined,
                         },
                     });
-                    // Track facet names we might create later so stop() can abort
-                    // them cleanly. Exact ids aren't known until inner calls
-                    // .get(id), so we just track the base name.
-                    this.doFacetNames.add('innerDO-' + bindingName + '-*');
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nimbus-sh/worker",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "Nimbus runtime package for Cloudflare Workers, re-exported publicly through @nimbus-sh/sdk/worker.",
   "keywords": [
     "cloudflare",
@@ -109,6 +109,7 @@
   },
   "files": [
     "dist",
+    "vendor",
     "public",
     "scripts",
     "runtime-contracts",
@@ -127,16 +128,16 @@
     "bundle:opencode": "node scripts/bundle-opencode.mjs",
     "bundle:agent-chat": "node scripts/bundle-agent-chat.mjs",
     "bundle": "bun run bundle:git && bun run bundle:facets && bun run bundle:esbuild && bun run bundle:sqlite && bun run bundle:shims && bun run bundle:tailwind && bun run bundle:opencode && bun run bundle:agent-chat",
-    "clean:dist": "node scripts/clean-dist.mjs",
+    "clean:dist": "node ../../scripts/clean-dist.mjs",
     "build": "bun run clean:dist && tsc -p tsconfig.json --noCheck --noEmit false --declaration true --declarationMap true --outDir dist --rootDir src",
-    "prepack": "bun run build",
+    "prepublishOnly": "bun ../../scripts/dist-integrity.mjs --publish",
     "typecheck": "tsc --noEmit && tsc -p frontend --noEmit"
   },
   "dependencies": {
     "@ai-sdk/openai-compatible": "^2.0.41",
-    "@nimbus-sh/core": "^0.12.0",
-    "@nimbus-sh/fabric": "^0.7.1",
-    "@nimbus-sh/platform": "^0.5.1",
+    "@nimbus-sh/core": "^0.13.0",
+    "@nimbus-sh/fabric": "^0.8.0",
+    "@nimbus-sh/platform": "^0.6.0",
     "@renovatebot/pep440": "^5.0.0",
     "ai": "^6.0.182",
     "clean-git-ref": "^2.0.1",
@@ -146,7 +147,6 @@
     "esbuild-wasm": "0.24.2",
     "ignore": "^5.1.4",
     "is-git-ref-name-valid": "^1.0.0",
-    "isomorphic-git": "npm:@ashishkumar472/cf-git@1.0.5",
     "minimisted": "^2.0.1",
     "pako": "1.0.11",
     "pify": "^4.0.1",
@@ -163,6 +163,7 @@
     "acorn": "^8.15.0",
     "dompurify": "3.4.12",
     "highlight.js": "11.11.1",
+    "isomorphic-git": "npm:@ashishkumar472/cf-git@1.0.5",
     "marked": "18.0.6",
     "preact": "10.29.7",
     "typescript": "^5.7.0"

package/public/_assets/opencode/1.16.2/index-attach.js

@@ -2688,7 +2688,7 @@ Command timed out before completion.`:`${e.output}${t}
 
 Command exited with code ${e.exitCode}.`},Uws=e=>e.cause instanceof Error&&e.cause.message==="Timed out",Kws=_y.make({description:`Execute one shell command string with the host user's filesystem, process, and network authority. The active Location is the default working directory. Relative workdir values resolve from that Location. External workdir values require external_directory approval; best-effort command-argument path warnings are advisory only. Timeout values are milliseconds (default: ${VCe}; maximum: ${$Ce}). Uses the configured shell when set; otherwise uses /bin/sh on POSIX and COMSPEC or cmd.exe on Windows.`,parameters:nPr,success:Gws,toModelOutput:({output:e})=>[f0({type:"text",text:Wws(e)})]}),Qws=e=>e.match(/(?:[^\s"']+|"[^"]*"|'[^']*')+/g)??[],Yws=e=>e.replace(/^(['"])(.*)\1$/,"$2"),Jws=(e,t)=>{let r=new Set;for(let n of Qws(e)){let s=Yws(n).replace(/[;,|&]+$/,"");if(!rut.isAbsolute(s))continue;let a=Wr.resolve(s);Wr.contains(t,a)||r.add(Wr.resolve(rut.dirname(a)))}return[...r]},Xws=Tt.effectDiscard(M.gen(function*(){let e=yield*k0.Service,t=yield*fx.Service,r=yield*hc.Service,n=yield*Hv.Service,s=yield*Zh.Service;yield*e.contribute(a=>a.set(uut,{tool:Kws,execute:({parameters:o,sessionID:l,call:c,assertPermission:u})=>M.gen(function*(){let d=yield*t.resolve({path:o.workdir??".",kind:"directory"}),f=d.target.externalDirectory;f&&(yield*u(fx.externalDirectoryPermission(f)));let p=Jws(o.command,d.target.canonical).map(E=>`Command argument references external directory ${rut.join(E,"*").replaceAll("\\","/")}. Bash runs with host-user filesystem, process, and network authority; this scan is advisory only.`);yield*u({action:uut,resources:[o.command],save:[o.command]});let m=yield*t.revalidate(d);if(!m.exists||m.type!=="Directory")throw Error(`Working directory is not a directory: ${m.canonical}`);let g=yield*s.entries(),y=Object.assign({},...g.flatMap(E=>E.type==="document"?[E.info]:[])).shell??Hws(),v=bl.make(o.command,[],{cwd:m.canonical,shell:y,stdin:"ignore",detached:process.platform!=="win32",forceKillAfter:Fo.seconds(3)}),b=o.timeout??VCe,_=yield*r.run(v,{timeout:Fo.millis(b),maxOutputBytes:cut,maxErrorBytes:cut}).pipe(M.catchTag("AppProcessError",E=>Uws(E)?M.succeed(void 0):M.fail(E)));if(!_)return{command:o.command,cwd:m.canonical,output:`Command exceeded timeout of ${b} ms. Retry with a larger timeout if the command is expected to take longer.`,truncated:!1,timedOut:!0,...p.length?{warnings:p}:{}};let A=Vws(_.stdout.toString("utf8"),_.stderr.toString("utf8")),w=zws(_.stdoutTruncated,_.stderrTruncated),S=yield*n.truncate({sessionID:l,toolCallID:c.id,content:w?`${A}
 
-${w}`:A});return{command:o.command,cwd:m.canonical,exitCode:_.exitCode,output:S.content,truncated:S.truncated||_.stdoutTruncated||_.stderrTruncated,...p.length?{warnings:p}:{},..._.stdoutTruncated?{stdoutTruncated:!0}:{},..._.stderrTruncated?{stderrTruncated:!0}:{},...S.truncated&&!_.stdoutTruncated&&!_.stderrTruncated?{resource:S.resource}:{}}}).pipe(M.catchCause(d=>M.fail(new Gu({message:`Unable to execute command: ${o.command}`,error:Dn.squash(d)}))))}))})),dut={};Ft(dut,{toModelOutput:()=>uPr,name:()=>sPr,layer:()=>dEs,Success:()=>lPr,Parameters:()=>aPr,ApplyPatchTool:()=>dut,Applied:()=>oPr});qoe={};Ft(qoe,{parse:()=>Zws,joinBom:()=>tEs,derive:()=>eEs,Patch:()=>qoe});sEs=(e,t)=>e===t,aEs=(e,t)=>e.trimEnd()===t.trimEnd(),oEs=(e,t)=>e.trim()===t.trim(),lEs=(e,t)=>RRr(e.trim())===RRr(t.trim()),RRr=e=>e.replace(/[‘’‚‛]/g,"'").replace(/[“”„‟]/g,'"').replace(/[‐‑‒–—―]/g,"-").replace(/…/g,"...").replace(/ /g," "),put=e=>e.startsWith("\uFEFF")?{bom:!0,text:e.slice(1)}:{bom:!1,text:e},uEs=e=>e.match(/^(?:cat\s+)?<<['"]?(\w+)['"]?\s*\n([\s\S]*?)\n\1\s*$/)?.[2]??e,sPr="apply_patch",aPr=T.Struct({patchText:T.String.annotate({description:"The full patch text describing add, update, and delete operations"})}),oPr=T.Struct({type:T.Literals(["add","update","delete"]),resource:T.String,target:T.String}),lPr=T.Struct({applied:T.Array(oPr)}),uPr=e=>["Applied patch sequentially:",...e.applied.map(t=>`${t.type==="add"?"A":t.type==="delete"?"D":"M"} ${t.resource}`)].join(`
+${w}`:A});return{command:o.command,cwd:m.canonical,exitCode:_.exitCode,output:S.content,truncated:S.truncated||_.stdoutTruncated||_.stderrTruncated,...p.length?{warnings:p}:{},..._.stdoutTruncated?{stdoutTruncated:!0}:{},..._.stderrTruncated?{stderrTruncated:!0}:{},...S.truncated&&!_.stdoutTruncated&&!_.stderrTruncated?{resource:S.resource}:{}}}).pipe(M.catchCause(d=>M.fail(new Gu({message:`Unable to execute command: ${o.command}`,error:Dn.squash(d)}))))}))})),dut={};Ft(dut,{toModelOutput:()=>uPr,name:()=>sPr,layer:()=>dEs,Success:()=>lPr,Parameters:()=>aPr,ApplyPatchTool:()=>dut,Applied:()=>oPr});qoe={};Ft(qoe,{parse:()=>Zws,joinBom:()=>tEs,derive:()=>eEs,Patch:()=>qoe});sEs=(e,t)=>e===t,aEs=(e,t)=>e.trimEnd()===t.trimEnd(),oEs=(e,t)=>e.trim()===t.trim(),lEs=(e,t)=>RRr(e.trim())===RRr(t.trim()),RRr=e=>e.replace(/[\u2018\u2019\u201a\u201b]/g,"'").replace(/[\u201c\u201d\u201e\u201f]/g,'"').replace(/[\u2010\u2011\u2012\u2013\u2014\u2015]/g,"-").replace(/\u2026/g,"...").replace(/\u00a0/g," "),put=e=>e.startsWith("\uFEFF")?{bom:!0,text:e.slice(1)}:{bom:!1,text:e},uEs=e=>e.match(/^(?:cat\s+)?<<['"]?(\w+)['"]?\s*\n([\s\S]*?)\n\1\s*$/)?.[2]??e,sPr="apply_patch",aPr=T.Struct({patchText:T.String.annotate({description:"The full patch text describing add, update, and delete operations"})}),oPr=T.Struct({type:T.Literals(["add","update","delete"]),resource:T.String,target:T.String}),lPr=T.Struct({applied:T.Array(oPr)}),uPr=e=>["Applied patch sequentially:",...e.applied.map(t=>`${t.type==="add"?"A":t.type==="delete"?"D":"M"} ${t.resource}`)].join(`
 `),cEs=_y.make({description:"Apply one patch containing add, update, and delete file operations. All targets are resolved and approved before target contents are read. Operations apply sequentially; if a later operation fails, earlier operations remain applied and the failure reports them explicitly. Moves and atomic rollback are not supported yet.",parameters:aPr,success:lPr,toModelOutput:({output:e})=>[f0({type:"text",text:uPr(e)})]}),dEs=Tt.effectDiscard(M.gen(function*(){let e=yield*k0.Service,t=yield*fx.Service,r=yield*G6.Service,n=yield*Wr.Service;yield*e.contribute(s=>s.set(sPr,{tool:cEs,execute:({parameters:a,assertPermission:o})=>{let l=[],c=(u,d)=>{let f=l.length===0?`Unable to apply patch at ${u}`:`Patch partially applied before failing at ${u}. Applied: ${l.map(p=>p.resource).join(", ")}`;return new Gu({message:f,error:d})};return M.gen(function*(){if(!a.patchText.trim())return yield*new Gu({message:"patchText is required"});let u=yield*M.try({try:()=>qoe.parse(a.patchText),catch:m=>new Gu({message:`apply_patch verification failed: ${String(m)}`})});if(u.length===0)return yield*new Gu({message:"patch rejected: empty patch"});if(u.find(m=>m.type==="update"&&m.movePath!==void 0))return yield*new Gu({message:"apply_patch moves are not supported yet"});let d=[];for(let m of u)d.push({hunk:m,plan:yield*t.resolve({path:m.path,kind:"file"})});let f=new Map;for(let{plan:m}of d){let g=m.target.externalDirectory;g&&f.set(g.resource,g)}for(let m of f.values())yield*o(fx.externalDirectoryPermission(m));yield*o({action:"edit",resources:[...new Set(d.map(({plan:m})=>m.target.resource))],save:["*"]});let p=[];for(let{hunk:m,plan:g}of d){if(m.type==="add"){if((yield*t.revalidate(g)).exists)return yield*c(m.path,Error("Target file already exists"));p.push({type:m.type,hunk:m,plan:g});continue}let y=yield*t.revalidate(g);if(!y.exists||y.type!=="File")return yield*c(m.path,Error("Target file does not exist"));if(m.type==="delete"){p.push({type:m.type,hunk:m,plan:g});continue}let v=yield*n.readFile(y.canonical),b=qoe.derive(m.path,m.chunks,new TextDecoder("utf-8",{ignoreBOM:!0}).decode(v));p.push({type:m.type,hunk:m,plan:g,source:v,content:qoe.joinBom(b.content,b.bom)})}return yield*M.uninterruptible(M.forEach(p,m=>M.gen(function*(){if(m.type==="add"){let y=yield*r.create({plan:m.plan,content:m.hunk.contents.endsWith(`
 `)||m.hunk.contents===""?m.hunk.contents:`${m.hunk.contents}
 `});l.push({type:m.type,resource:y.resource,target:y.target});return}if(m.type==="delete"){let y=yield*r.remove({plan:m.plan});l.push({type:m.type,resource:y.resource,target:y.target});return}let g=yield*r.writeIfUnchanged({plan:m.plan,expected:m.source,content:m.content});l.push({type:m.type,resource:g.resource,target:g.target})}).pipe(M.catchCause(g=>M.fail(c(m.hunk.path,Dn.squash(g))))),{discard:!0})),{applied:l}}).pipe(M.catchCause(u=>{let d=Dn.squash(u);return M.fail(d instanceof Gu?d:c("patch",d))}))}}))})),fut={};Ft(fut,{toModelOutput:()=>fPr,name:()=>cPr,layer:()=>vEs,Success:()=>pPr,Parameters:()=>dPr,EditTool:()=>fut});cPr="edit",dPr=T.Struct({path:T.String.annotate({description:"File path to edit. Relative paths resolve within the active Location. Absolute paths inside that Location are accepted; external absolute paths require external_directory approval. Named project references are read-oriented and are not accepted."}),oldString:T.String.annotate({description:"Exact text to replace"}),newString:T.String.annotate({description:"Replacement text, which must differ from oldString"}),replaceAll:T.Boolean.pipe(T.optional).annotate({description:"Replace all exact occurrences of oldString (default false)"})}),pPr=T.Struct({operation:T.Literal("write"),target:T.String,resource:T.String,existed:T.Boolean,replacements:T.Number}),hut=e=>e.replaceAll(`\r
@@ -3775,7 +3775,7 @@ gh pr create --title "the pr title" --body-file pr-body.txt`,parameterDescriptio
 `);s.length>0&&s[s.length-1]===""&&s.pop();let a=D6s(s,e,t),o=O6s(s,a);(o.length===0||o[o.length-1]!=="")&&o.push("");let l=xj(o.join(`
 `)),c=l.text;return{unified_diff:R6s(n.text,c),content:c,bom:n.bom||l.bom}}function D6s(e,t,r){let n=[],s=0;for(let a of r){if(a.change_context){let u=Spt(e,[a.change_context],s);if(u===-1)throw Error(`Failed to find context '${a.change_context}' in ${t}`);s=u+1}if(a.old_lines.length===0){let u=e.length>0&&e[e.length-1]===""?e.length-1:e.length;n.push([u,0,a.new_lines]);continue}let{old_lines:o,new_lines:l}=a,c=Spt(e,o,s,a.is_end_of_file);if(c===-1&&o.length>0&&o[o.length-1]===""&&(o=o.slice(0,-1),l.length>0&&l[l.length-1]===""&&(l=l.slice(0,-1)),c=Spt(e,o,s,a.is_end_of_file)),c!==-1)n.push([c,o.length,l]),s=c+o.length;else throw Error(`Failed to find expected lines in ${t}:
 ${a.old_lines.join(`
-`)}`)}return n.sort((a,o)=>a[0]-o[0]),n}function O6s(e,t){let r=[...e];for(let n=t.length-1;n>=0;n--){let[s,a,o]=t[n];r.splice(s,a);for(let l=0;l<o.length;l++)r.splice(s+l,0,o[l])}return r}function YFr(e){return e.replace(/[‘’‚‛]/g,"'").replace(/[“”„‟]/g,'"').replace(/[‐‑‒–—―]/g,"-").replace(/…/g,"...").replace(/ /g," ")}function nDe(e,t,r,n,s){if(s){let a=e.length-t.length;if(a>=r){let o=!0;for(let l=0;l<t.length;l++)if(!n(e[a+l],t[l])){o=!1;break}if(o)return a}}for(let a=r;a<=e.length-t.length;a++){let o=!0;for(let l=0;l<t.length;l++)if(!n(e[a+l],t[l])){o=!1;break}if(o)return a}return-1}function Spt(e,t,r,n=!1){if(t.length===0)return-1;let s=nDe(e,t,r,(l,c)=>l===c,n);if(s!==-1)return s;let a=nDe(e,t,r,(l,c)=>l.trimEnd()===c.trimEnd(),n);if(a!==-1)return a;let o=nDe(e,t,r,(l,c)=>l.trim()===c.trim(),n);return o!==-1?o:nDe(e,t,r,(l,c)=>YFr(l.trim())===YFr(c.trim()),n)}function R6s(e,t){let r=e.split(`
+`)}`)}return n.sort((a,o)=>a[0]-o[0]),n}function O6s(e,t){let r=[...e];for(let n=t.length-1;n>=0;n--){let[s,a,o]=t[n];r.splice(s,a);for(let l=0;l<o.length;l++)r.splice(s+l,0,o[l])}return r}function YFr(e){return e.replace(/[\u2018\u2019\u201a\u201b]/g,"'").replace(/[\u201c\u201d\u201e\u201f]/g,'"').replace(/[\u2010\u2011\u2012\u2013\u2014\u2015]/g,"-").replace(/\u2026/g,"...").replace(/\u00a0/g," ")}function nDe(e,t,r,n,s){if(s){let a=e.length-t.length;if(a>=r){let o=!0;for(let l=0;l<t.length;l++)if(!n(e[a+l],t[l])){o=!1;break}if(o)return a}}for(let a=r;a<=e.length-t.length;a++){let o=!0;for(let l=0;l<t.length;l++)if(!n(e[a+l],t[l])){o=!1;break}if(o)return a}return-1}function Spt(e,t,r,n=!1){if(t.length===0)return-1;let s=nDe(e,t,r,(l,c)=>l===c,n);if(s!==-1)return s;let a=nDe(e,t,r,(l,c)=>l.trimEnd()===c.trimEnd(),n);if(a!==-1)return a;let o=nDe(e,t,r,(l,c)=>l.trim()===c.trim(),n);return o!==-1?o:nDe(e,t,r,(l,c)=>YFr(l.trim())===YFr(c.trim()),n)}function R6s(e,t){let r=e.split(`
 `),n=t.split(`
 `),s=`@@ -1 +1 @@
 `,a=Math.max(r.length,n.length),o=!1;for(let l=0;l<a;l++){let c=r[l]||"",u=n[l]||"";c!==u?(c&&(s+=`-${c}