@tencent-ai/agent-harness 0.2.0-beta.6 → 0.2.0-beta.8

package/lib/application/services.d.ts

@@ -1,4 +1,6 @@
+import { Context, Layer } from 'effect';
 import type { QueryOptions } from '#agent-harness-codebuddy/server';
+import type { HarnessHooks } from '#agent-harness-components/functional-hooks';
 import { composeAgentHarnessModules } from '../module/compose.js';
 import { type AgentHarnessClientIdentity } from '../runtime/client-identity.js';
 import { CodeBuddyProcessContainment } from '../runtime/process-containment.js';
@@ -18,6 +20,7 @@ export interface ApplicationServicesOptions {
     readonly sandboxCenter?: SandboxCenterOption;
     readonly signal?: AbortSignal;
     readonly tools?: QueryOptions['tools'];
+    readonly hooks?: HarnessHooks;
     readonly strictMcpConfig: boolean;
     readonly mcp?: {
         readonly toolsSyncTtlMs?: number | null;
@@ -32,5 +35,14 @@ export interface ApplicationServices {
     readonly containment: CodeBuddyProcessContainment;
     readonly runtimeShutdown: AbortController;
     readonly recordLifecycle: RuntimeLifecycleRecorder;
+    /** Stop protocol admission and drain modules; the application Scope releases its dependencies. */
+    close(reason?: unknown): Promise<void>;
 }
-export declare function createApplicationServices({ clientIdentity, clientIdentityEnv, dependencies, packageVersion, processRuntime, productConfig, sandboxCenter, tools, strictMcpConfig, mcp, shutdown, telemetryOptions, signal, }: ApplicationServicesOptions): Promise<ApplicationServices>;
+declare const Application_base: Context.ServiceClass<Application, "@genie/agent-harness/application/Application", ApplicationServices>;
+/** The shared composition root for the CLI and embedded Harness. */
+export declare class Application extends Application_base {
+    static layer(options: ApplicationServicesOptions): Layer.Layer<Application, unknown>;
+}
+/** Promise boundary shared by both hosts. No Effect types escape the public Harness API. */
+export declare function createApplicationServices(options: ApplicationServicesOptions): Promise<ApplicationServices>;
+export {};

package/lib/application/services.js

@@ -1 +1 @@
-var Ve=Object.defineProperty;var t=(E,H)=>Ve(E,"name",{value:H,configurable:!0});import{homedir as we}from"node:os";import*as k from"node:path";import{isDeepStrictEqual as Xe}from"node:util";import{Context as d,Effect as m,Exit as y,Layer as s,Logger as u,Option as Qe,Scope as h}from"effect";import{WORKBUDDY_ENABLE_LINUX_SANDBOX_CLI as Ae}from"#agent-harness-components/sandbox";import{createAgentProtocolModule as Je}from"../agent/router.js";import{createAgentV2Facade as Ze}from"../agent/v2.js";import{ManagedAuthLocal as $e}from"../auth/local.js";import{ManagedAuth as er}from"../auth/managed.js";import{createAuthProtocolModule as rr}from"../auth/module.js";import{Checkpoints as _e}from"../checkpoint/service.js";import{ConfigFiles as re}from"../config/files.js";import{createDefaultAgentMcpIntegration as tr}from"../integration/agent-integration.js";import{PluginMcp as be}from"../integration/plugin-mcp.js";import{UserMcp as ke}from"../integration/user-mcp.js";import{requestWithEnvironment as or}from"../internal/http.js";import{createMcpServerProtocolModule as nr}from"../mcp-server/module.js";import{composeAgentHarnessModules as ir}from"../module/compose.js";import{PluginComponents as te}from"../plugin/components.js";import{createProductProtocolModule as ar}from"../product/module.js";import{preflightCodeBuddyCode as sr}from"../runtime/agent-runtime.js";import{buildAgentHarnessClientIdentityEnv as cr,buildAgentHarnessClientIdentityHeaders as dr}from"../runtime/client-identity.js";import{createCodeBuddyAuthRuntime as ur}from"../runtime/codebuddy-auth.js";import{createCodeBuddyProductLifecycle as pr}from"../runtime/codebuddy-product.js";import{DEFAULT_HOST_HEALTH_TIMEOUT_MS as mr,DEFAULT_READY_TIMEOUT_MS as lr}from"../runtime/codebuddy-resource-timeouts.js";import{CodeBuddyProcessContainment as fr}from"../runtime/process-containment.js";import{parseAgentHarnessProductConfig as hr,parseHarnessProductInput as gr}from"../runtime/product-config.js";import{ProductManager as yr}from"../runtime/product-manager.js";import{ProductResolver as De}from"../runtime/product-resolver.js";import{ProductResolverRequestError as Er}from"../runtime/product-resolver-error.js";import{loadProductSource as Sr}from"../runtime/product-source.js";import{HarnessSandboxCenter as vr}from"../runtime/sandbox-center.js";import{AgentHarnessServer as Cr,DEFAULT_LIFECYCLE_HOOK_TIMEOUT_MS as Pr}from"../server/index.js";import{makeServiceRpcs as wr}from"../server/rpc-services.js";import{AgentBackend as Ar,workspaceQueryOptions as _r}from"../session/agent-backend.js";import{AgentServer as Ie}from"../session/agent-server.js";import{readSessionConfigDefaults as br}from"../session/config-defaults.js";import{SessionConfigStore as kr}from"../session/config-store.js";import{SessionFiles as Dr}from"../session/files.js";import{localFs as Me}from"../session/local-fs.js";import{SessionReplay as Le}from"../session/replay.js";import{SessionRuntime as Ir}from"../session/runtime.js";import{Sessions as Te}from"../session/service.js";import{toExecutorPrivateProxyPolicy as Oe}from"../settings/proxy-policy.js";import{createHarnessSettingsRuntime as Mr}from"../settings/runtime.js";import{Settings as Lr}from"../settings/service.js";import{createSubagentProtocolModule as Tr}from"../subagent/module.js";import{createEffectTelemetryMetricAggregator as Or}from"../telemetry/effect-metric-aggregation.js";import{createTelemetry as Rr}from"../telemetry/runtime.js";import{measureStartup as oe,startupProfiler as i}from"../telemetry/startup-profile.js";import{closeInPhases as ne,closeTelemetry as Fr,createCloseOnce as _,DEFAULT_TELEMETRY_CLOSE_TIMEOUT_MS as xr}from"./lifecycle.js";export async function createApplicationServices({clientIdentity:E,clientIdentityEnv:H,dependencies:v,packageVersion:Re,processRuntime:g,productConfig:O,sandboxCenter:Fe,tools:ie,strictMcpConfig:xe,mcp:Ue,shutdown:B,telemetryOptions:ae,signal:p}){p?.throwIfAborted();const C=t(r=>m.runPromise(r,{signal:p}),"runStartupEffect"),z=B,se={name:"@genie/agent-harness",title:"Agent Harness",version:Re},ce=(v.preflightCodeBuddyCode??sr)(),D=new fr,R=new AbortController,l=Rr(ae),W=_(()=>Fr(l,g,Math.max(1,Math.min(B.remainingMs(),ae.flushTimeoutMs??xr))));B.registerTelemetryCloser(W);const de=Or(r=>l.recordEffectMetrics(r));try{g.addFinalizer(W)}catch(r){throw await W(),r}try{g.setTelemetryObserver({log:t(r=>l.recordEffectLog(r),"log"),metrics:t(r=>de.record("harness",r),"metrics"),span:t(r=>l.recordEffectSpan(r),"span")})}catch{}const b=t(r=>l.recordLifecycle(r),"recordLifecycle"),F=new vr(process.env.CODEBUDDY_CONFIG_DIR?.trim()?k.resolve(process.env.CODEBUDDY_CONFIG_DIR.trim()):k.join(we(),".codebuddy"),Fe,process.env.SANDBOX_CENTER_IPC_ADDRESS?.trim()),N=_(()=>F.close());g.addFinalizer(N);let ue=!1;const Y=t((r,c,T)=>{ue||(ue=!0,b({component:"server",error:r,phase:"runtime",process:{pid:process.pid},reason:T,state:c}))},"recordRootFailure");D.signal.addEventListener("abort",()=>{Y(D.signal.reason,"containment_tripped","containment_failed")},{once:!0});const He={log(r){try{l.recordEffectLog(r)}catch{}},metrics(r){de.record("executor",r)},span(r){try{l.recordEffectSpan(r)}catch{}}};let P,n,x,I,a,A,M,w;const L=h.makeUnsafe(),G=_(r=>m.runPromise(h.close(L,r===void 0?y.void:y.fail(r))));g.addFinalizer(()=>G(void 0));const j=t(()=>{x&&m.runPromise(m.forkIn(x.prepare,L,{startImmediately:!0})).catch(()=>{})},"prepareRuntime"),pe=h.makeUnsafe(),q=_(async r=>{try{await a?.close(r)}finally{await m.runPromise(h.close(pe,r===void 0?y.void:y.fail(r)))}});g.addFinalizer(()=>q(void 0));const K=h.makeUnsafe(),V=_(r=>m.runPromise(h.close(K,r===void 0?y.void:y.fail(r))));g.addFinalizer(()=>V(void 0));const me=h.makeUnsafe(),X=_(r=>m.runPromise(h.close(me,r===void 0?y.void:y.fail(r))));g.addFinalizer(()=>X(void 0));const le=h.makeUnsafe(),Q=_(async r=>{try{await n?.close(r)}finally{await m.runPromise(h.close(le,r===void 0?y.void:y.fail(r)))}});g.addFinalizer(()=>Q(void 0));try{const r={...process.env},c={...H,...F.environment},T=typeof O=="object"?gr(O):Sr(O,{parse:hr});p?.throwIfAborted(),i()?.markStart("harness.product");const Be=await C(s.buildWithScope(De.layer({projection:T.projection,baseConfiguration:O===void 0?void 0:{},packageRoot:ce.productRoot??k.dirname(ce.packageJsonPath),clientIdentity:{ideName:E.ideName,ideType:E.ideType,ideVersion:E.ideVersion,...E.userAgent===void 0?{}:{userAgent:E.userAgent}},environment:t(()=>({...r,...c}),"environment")}),pe));a=await(v.createProductManager??((e,o)=>yr.create(e,o)))({bootstrap:T.bootstrap,projection:T.projection,resolver:d.get(Be,De)},p),i()?.markEnd("harness.product");const ze=t(()=>{if(!a)throw new Error("Product manager is not ready");return a.getLaunchSnapshot()},"productLaunch");p?.throwIfAborted(),i()?.markStart("harness.config");const We=await C(s.buildWithScope(re.layer.pipe(s.provide(u.layer([u.withConsoleError(u.formatLogFmt)]))),K));i()?.markEnd("harness.config");const J=d.get(We,re),he=t((e,o)=>br(J,e,o),"sessionConfigDefaults");p?.throwIfAborted(),i()?.markStart("harness.settings"),A=await(v.createSettingsRuntime??Mr)({ambientEnvironment:r,config:J,environment:c,observe:t(e=>l.recordEffectLog({annotations:{component:"harness",operation:"refresh",reason:e.reason,resource:"policy","runtime.role":"harness",status:e.status,...e.policy===void 0?{}:{mode:e.policy.mode,noProxyCount:e.policy.noProxyCount,proxyConfigured:e.policy.proxyConfigured,proxySupport:e.policy.proxySupport,revision:e.policy.revision}},level:e.status==="failed"?"warn":"info",message:"harness.settings.proxy"}),"observe"),processRuntime:g}),i()?.markEnd("harness.settings");const ge=kr.layer(k.join(r.CODEBUDDY_CONFIG_DIR?.trim()?k.resolve(r.CODEBUDDY_CONFIG_DIR.trim()):k.join(we(),".codebuddy"),"harness","sessions"));p?.throwIfAborted(),i()?.markStart("harness.session-runtime");const ye=process.platform==="linux"?r[Ae]??((await import("#agent-harness-components/session-config")).isLinuxSandboxCLIInstalled()?"1":"0"):void 0,Ee=await C(s.buildWithScope(v.sessionRuntimeLayer??Ar({checkpoints:!0,headers:dr(E),prepareSandboxCenter:t((e,o)=>F.prepare(e.account?.uid,o),"prepareSandboxCenter"),resolveOptions:t(e=>m.map(_r(e),o=>({...o,...ie===void 0?{}:{tools:ie}})),"resolveOptions"),resolveConfigDefaults:t(e=>m.tryPromise({try:t(()=>he(e.workspace?.canonicalCwd??e.cwd??process.cwd(),e.signal),"try"),catch:t(o=>o,"catch")}),"resolveConfigDefaults")}).pipe(s.provideMerge(Ie.layer({product:{},fs:Me,settingSources:["user","project","local"],env:{...cr(E),CODEBUDDY_API_KEY_DISABLED:"1",CODEBUDDY_REMOTE_CONFIG_DISABLED:"1",CODEBUDDY_INCLUDE_TOPIC_MESSAGE:"true",...ye===void 0?{}:{[Ae]:ye},...F.environment,CODEBUDDY_CODE_DISABLE_FILE_CHECKPOINTING:r.CODEBUDDY_CODE_DISABLE_FILE_CHECKPOINTING??"0"}})),s.provide(ge)),L));i()?.markEnd("harness.session-runtime"),x=d.get(Ee,Ir),p?.throwIfAborted(),i()?.markStart("harness.replay");const Ne=d.get(await C(s.buildWithScope(Le.layer({},e=>Me.readFileBuffer(e),he).pipe(s.provide(ge)),L)),Le);i()?.markEnd("harness.replay"),p?.throwIfAborted(),i()?.markStart("harness.storage");const Se=await C(s.buildWithScope(s.mergeAll(Te.layer,_e.layer).pipe(s.provide(Dr.layer),s.provide(u.layer([u.withConsoleError(u.formatLogFmt)]))),L));i()?.markEnd("harness.storage");const Ye=d.get(Se,Te),Ge=d.get(Se,_e);I=(v.createMcpIntegration??(e=>tr({containment:e.containment,recordEffectTelemetry:e.recordEffectTelemetry,recordLifecycle:e.recordLifecycle,supervisor:{environment:e.environment,toolsSyncTtlMs:Ue?.toolsSyncTtlMs,proxyPolicy:e.proxyPolicy}})))({containment:D,environment:c,proxyPolicy:Oe(A.currentProxyPolicy,c),recordEffectTelemetry:He,recordLifecycle:b}),M=A.subscribe(e=>{const o=Oe(e,c);I?.configureProxy?.(o).catch(()=>{l.recordEffectLog({annotations:{component:"harness",operation:"update",resource:"policy","runtime.role":"harness",status:"failed"},level:"warn",message:"harness.settings.proxy"})})});const ve=Qe.getOrUndefined(d.getOption(Ee,Ie));p?.throwIfAborted(),i()?.markStart("harness.mcp-services");const Z=await C(s.buildWithScope(s.mergeAll(ke.layer({environment:t(()=>({...r,...c}),"environment")}),be.layer).pipe(s.provideMerge(te.layer({environment:t(()=>({...r,...c}),"environment"),product:t(()=>a.getConfiguration(),"product"),writeContext:t(async()=>{await n?.prepareHostExecution(R.signal);const e=t(()=>({environment:{...r,...c},product:structuredClone(a.getConfiguration()),authentication:n?.currentSessionAuthentication()}),"capture");return n?n.runConsistentRead(e):e()},"writeContext"),onConfigChange:ve?async(e,o)=>{const f=o.authentication;ve.notifyConfigChange({source:e.source,filePath:e.file_path,cwd:e.cwd},{product:o.product,environment:o.environment,fetch:t((ee,U)=>or(ee,U,o.environment),"fetch"),auth:f?{accessToken:f.credential.accessToken,method:f.credential.type,refresh:t(async({signal:ee})=>{if(!n||!a)throw new Error("Hook authentication is unavailable");const U=t(()=>{if(!Xe(o.product,a.getConfiguration()))throw new Error("Hook Product changed")},"checkProduct");await n.runConsistentRead(U);const Pe=await n.refreshHostAuthentication(f,ee);return await n.runConsistentRead(U),{accessToken:Pe.credential.accessToken,method:Pe.credential.type}},"refresh")}:void 0,account:f?{uid:f.account.id,enterpriseId:f.account.organization?.id}:void 0}).catch(()=>m.runSync(m.logWarning("harness.config-change.failed").pipe(m.provide(u.layer([u.withConsoleError(u.formatLogFmt)])))))}:void 0,reloadUserConfig:t(e=>P?.reloadUserConfig(e)??Promise.resolve(),"reloadUserConfig")})),s.provide(u.layer([u.withConsoleError(u.formatLogFmt)]))),me));i()?.markEnd("harness.mcp-services"),p?.throwIfAborted(),i()?.markStart("harness.agent-facade"),P=await(v.createAgentFacade??Ze)({userMcp:d.get(Z,ke),pluginMcp:d.get(Z,be),checkpoints:Ge,sessions:Ye,initialProductGeneration:ze().productGeneration,mcpIntegration:I,strictMcpConfig:xe,onPermanentFailure:t(e=>{Y(e,"fused","recovery_failed"),R.abort(e)},"onPermanentFailure"),prepareSessionRuntime:t((e,o)=>{if(!n)throw new Error("Authentication runtime is not ready");return n.prepareSessionRuntime(e,o.connectionSignal)},"prepareSessionRuntime"),prepareSessionWorkspace:t(async(e,o)=>{if(!n||!a)throw new Error("Product manager is not ready");try{return await a.prepareWorkspace(e,{signal:o})}catch(f){if(!(f instanceof Er&&f.code==="AUTH_REFRESH_REQUIRED"))throw f;return await n.refreshProductAuthentication(o),a.prepareWorkspace(e,{force:!0,signal:o})}},"prepareSessionWorkspace"),releaseSessionWorkspace:t((e,o)=>a?a.releaseWorkspace(e,o):Promise.resolve(),"releaseSessionWorkspace"),refreshAuthentication:t((e,o)=>{if(!n)throw new Error("Authentication runtime is not ready");return n.refreshAuthentication(e,{signal:o?.signal??AbortSignal.abort(new Error("Authentication refresh has no operation signal"))})},"refreshAuthentication"),serverInfo:se,sessionRuntime:x,sessionReplay:Ne}),i()?.markEnd("harness.agent-facade");const Ce=pr({facade:P,onExecutionProductCommitted:j,product:a});p?.throwIfAborted(),i()?.markStart("harness.auth-service");const je=await C(s.buildWithScope(v.managedAuthLayer??$e({...a.resolveLoginProduct?{resolveLoginProduct:t((e,o)=>a.resolveLoginProduct(e,o),"resolveLoginProduct")}:{},environment:t(()=>({...r,...c}),"environment"),product:t(()=>a.getConfiguration(),"product")}).pipe(s.provide(u.layer([u.withConsoleError(u.formatLogFmt)]))),le));i()?.markEnd("harness.auth-service"),n=ur({consumer:P,getAuthMethods:t(()=>a.getAuthMethods(),"getAuthMethods"),managedAuth:d.get(je,er),onRuntimePreparing:j,onRuntimePrepared:j,productLifecycle:Ce});const S=await rr(n);n.bindProtocolBridge(S.bridge);const $=ar({selectConnectionProductProfile:t((e,o)=>n.selectConnectionProductProfile(e,o),"selectConnectionProductProfile"),provisionProduct:t((e,o)=>S.runAuthMutation(()=>n.provisionProduct(e,o),{signal:o.signal}),"provisionProduct"),readProduct:t((e,o)=>n.readProduct(e,o),"readProduct"),provisionWorkspaceProduct:t((e,o)=>S.runAuthMutation(()=>n.provisionWorkspaceProduct(e,o),{signal:o.signal}),"provisionWorkspaceProduct"),readWorkspaceProduct:t((e,o)=>a.readWorkspaceProduct(e,o),"readWorkspaceProduct")});a.bindPublisher({notifyProductUpdated:t(()=>$.publisher.notifyProductUpdated(Ce.currentProductSnapshot()),"notifyProductUpdated"),notifyWorkspaceProductUpdated:t(e=>$.publisher.notifyWorkspaceProductUpdated(e),"notifyWorkspaceProductUpdated")});const qe=d.empty().pipe(d.add(Lr,A),d.add(re,J),d.add(te,d.get(Z,te)));p?.throwIfAborted(),i()?.markStart("harness.rpc-services");const Ke=await C(m.provide(wr.pipe(h.provide(K)),qe));i()?.markEnd("harness.rpc-services"),w=ir([{name:"private-runtime-lifecycle",capabilities:{},initialize:t(async(e,o)=>{await oe("harness.initialize.settings",()=>A?.initialize(o.connectionSignal))},"initialize"),close:t(async e=>{M?.(),M=void 0,await X(e),await A?.close(e),await ne([[()=>G(e),()=>I?.close(e)??Promise.resolve()],[()=>N()],[()=>q(e)]],z,"private runtime shutdown")},"close")},Je({v2:P}),nr({backend:P}),Tr({backend:P}),$,{name:S.name,capabilities:S.capabilities,initialize:t(async(e,o)=>oe("harness.initialize.auth",()=>S.initialize(e,o)),"initialize"),initialized:S.initialized,notificationHandlers:S.notificationHandlers,requestHandlers:S.requestHandlers,close:Q},{...Ke,close:V}])}catch(r){throw M?.(),M=void 0,b({component:"server",error:r,phase:"startup",process:{pid:process.pid},reason:"startup_failed",state:"startup_failed"}),await ne([[()=>V(r)],[()=>Q(r)],[()=>P?.close(r)??Promise.resolve(),()=>G(r)],[()=>I?.close(r)??Promise.resolve()],[()=>X(r)],[()=>A?.close(r)??Promise.resolve()],[()=>N()],[()=>q(r)]],z,"module startup cleanup").catch(()=>{}),r}let fe;try{p?.throwIfAborted(),fe=(v.createServer??(r=>new Cr(r)))({serverInfo:se,capabilities:w.capabilities,initializeHookTimeoutMs:lr+mr+Pr,initialize:t(async(r,c)=>(i()?.markEnd("harness.wait-initialize"),oe("harness.initialize",()=>w.initialize(r,c))),"initialize"),initialized:w.initialized,notificationHandlers:w.notificationHandlers,onContainmentFailure:t(r=>{Y(r,"containment_tripped","containment_failed"),R.abort(r)},"onContainmentFailure"),readinessSignal:D.signal,requestHandlers:w.requestHandlers,telemetryRuntime:l})}catch(r){b({component:"server",error:r,phase:"startup",process:{pid:process.pid},reason:"startup_failed",state:"startup_failed"});try{await ne([[()=>w.close(r)]],z,"server construction cleanup")}catch(c){b({component:"server",error:c,phase:"cleanup",process:{pid:process.pid},reason:"cleanup_failed",state:"shutdown_failed"})}throw r}return{server:fe,modules:w,telemetry:l,containment:D,runtimeShutdown:R,recordLifecycle:b}}t(createApplicationServices,"createApplicationServices");
+var ir=Object.defineProperty;var t=(l,P)=>ir(l,"name",{value:P,configurable:!0});import{homedir as Le}from"node:os";import*as I from"node:path";import{isDeepStrictEqual as ar}from"node:util";import{Cause as Te,Context as d,Effect as a,Exit as h,Layer as p,Logger as ie,Option as sr,Scope as m}from"effect";import{WORKBUDDY_ENABLE_LINUX_SANDBOX_CLI as xe}from"#agent-harness-components/sandbox";import{createAgentProtocolModule as cr}from"../agent/router.js";import{createAgentV2Facade as dr}from"../agent/v2.js";import{ManagedAuthLocal as ur}from"../auth/local.js";import{ManagedAuth as pr}from"../auth/managed.js";import{createAuthProtocolModule as mr}from"../auth/module.js";import{Checkpoints as Oe}from"../checkpoint/service.js";import{ConfigFiles as ae}from"../config/files.js";import{HostHooks as Ue}from"../harness/hooks.js";import{createDefaultAgentMcpIntegration as lr}from"../integration/agent-integration.js";import{PluginMcp as He}from"../integration/plugin-mcp.js";import{UserMcp as Fe}from"../integration/user-mcp.js";import{requestWithEnvironment as fr}from"../internal/http.js";import{createMcpServerProtocolModule as hr}from"../mcp-server/module.js";import{composeAgentHarnessModules as gr}from"../module/compose.js";import{PluginComponents as se}from"../plugin/components.js";import{createProductProtocolModule as yr}from"../product/module.js";import{preflightCodeBuddyCode as vr}from"../runtime/agent-runtime.js";import{buildAgentHarnessClientIdentityEnv as Er,buildAgentHarnessClientIdentityHeaders as Sr}from"../runtime/client-identity.js";import{createCodeBuddyAuthRuntime as Pr}from"../runtime/codebuddy-auth.js";import{createCodeBuddyProductLifecycle as Cr}from"../runtime/codebuddy-product.js";import{DEFAULT_HOST_HEALTH_TIMEOUT_MS as wr,DEFAULT_READY_TIMEOUT_MS as Ar}from"../runtime/codebuddy-resource-timeouts.js";import{CodeBuddyProcessContainment as kr}from"../runtime/process-containment.js";import{parseAgentHarnessProductConfig as _r,parseHarnessProductInput as br}from"../runtime/product-config.js";import{ProductManager as Dr}from"../runtime/product-manager.js";import{ProductResolver as Be}from"../runtime/product-resolver.js";import{ProductResolverRequestError as Mr}from"../runtime/product-resolver-error.js";import{loadProductSource as Ir}from"../runtime/product-source.js";import{HarnessSandboxCenter as Rr}from"../runtime/sandbox-center.js";import{AgentHarnessServer as Lr,DEFAULT_LIFECYCLE_HOOK_TIMEOUT_MS as Tr}from"../server/index.js";import{makeServiceRpcs as xr}from"../server/rpc-services.js";import{AgentBackend as Or,workspaceQueryOptions as Ur}from"../session/agent-backend.js";import{AgentServer as ze}from"../session/agent-server.js";import{readSessionConfigDefaults as Hr}from"../session/config-defaults.js";import{SessionConfigStore as Fr}from"../session/config-store.js";import{SessionFiles as Br}from"../session/files.js";import{localFs as Ne}from"../session/local-fs.js";import{SessionReplay as We}from"../session/replay.js";import{SessionRuntime as zr}from"../session/runtime.js";import{Sessions as Ye}from"../session/service.js";import{toExecutorPrivateProxyPolicy as qe}from"../settings/proxy-policy.js";import{createHarnessSettingsRuntime as Nr}from"../settings/runtime.js";import{Settings as Wr}from"../settings/service.js";import{createSubagentProtocolModule as Yr}from"../subagent/module.js";import{createEffectTelemetryMetricAggregator as qr}from"../telemetry/effect-metric-aggregation.js";import{createTelemetry as Gr}from"../telemetry/runtime.js";import{measureStartup as ce,startupProfiler as s}from"../telemetry/startup-profile.js";import{closeInPhases as H,closeTelemetry as jr,createCloseOnce as k,DEFAULT_TELEMETRY_CLOSE_TIMEOUT_MS as Kr,withNativeShutdownTimeout as Vr}from"./lifecycle.js";const F=ie.layer([ie.withConsoleError(ie.formatLogFmt)]);export class Application extends d.Service()("@genie/agent-harness/application/Application"){static{t(this,"Application")}static layer(P){return p.fromBuildMemo((f,R)=>a.gen(function*(){const g=yield*a.tryPromise({try:t(()=>Xr(P,R,f),"try"),catch:t(b=>b,"catch")});return d.make(Application,g)}).pipe(a.uninterruptible))}}export async function createApplicationServices(l){const P=m.makeUnsafe(),f=k(g=>a.runPromise(m.close(P,g===void 0?h.void:h.fail(g)))),R=l.processRuntime.addFinalizer(()=>f());try{return d.get(await a.runPromise(p.buildWithScope(Application.layer(l),P)),Application)}catch(g){throw await H([[()=>f(g)]],l.shutdown,"application acquisition cleanup").then(R,()=>{}),g}}t(createApplicationServices,"createApplicationServices");async function Xr({clientIdentity:l,clientIdentityEnv:P,dependencies:f,packageVersion:R,processRuntime:g,productConfig:b,sandboxCenter:Ge,tools:de,hooks:je,strictMcpConfig:Ke,mcp:Ve,shutdown:D,telemetryOptions:ue,signal:u},pe,me){u?.throwIfAborted();const le=t(async e=>{const i=await a.runPromiseExit(e,{signal:u});if(h.isSuccess(i))return i.value;throw u?.aborted&&Te.hasInterruptsOnly(i.cause)?u.reason:Te.squash(i.cause)},"runStartupEffect"),C=t((e,i)=>le(p.buildWithMemoMap(e,me,i)),"build"),w=t(e=>a.runSync(m.addFinalizerExit(pe,()=>a.promise(()=>Vr(Promise.resolve().then(e),Math.max(1,Math.min(D.phaseMs,D.remainingMs())),"application resource release")))),"addFinalizer"),Y=D,fe={name:"@genie/agent-harness",title:"Agent Harness",version:R},he=(f.preflightCodeBuddyCode??vr)(),L=new kr,B=new AbortController,y=Gr(ue),q=k(()=>jr(y,g,Math.max(1,Math.min(D.remainingMs(),ue.flushTimeoutMs??Kr))));D.registerTelemetryCloser(q);const ge=qr(e=>y.recordEffectMetrics(e));try{w(q)}catch(e){throw await q(),e}try{g.setTelemetryObserver({log:t(e=>y.recordEffectLog(e),"log"),metrics:t(e=>ge.record("harness",e),"metrics"),span:t(e=>y.recordEffectSpan(e),"span")})}catch{}const M=t(e=>y.recordLifecycle(e),"recordLifecycle"),z=new Rr(process.env.CODEBUDDY_CONFIG_DIR?.trim()?I.resolve(process.env.CODEBUDDY_CONFIG_DIR.trim()):I.join(Le(),".codebuddy"),Ge,process.env.SANDBOX_CENTER_IPC_ADDRESS?.trim()),G=k(()=>z.close());w(G);let ye=!1;const j=t((e,i,U)=>{ye||(ye=!0,M({component:"server",error:e,phase:"runtime",process:{pid:process.pid},reason:U,state:i}))},"recordRootFailure");L.signal.addEventListener("abort",()=>{j(L.signal.reason,"containment_tripped","containment_failed")},{once:!0});const Xe={log(e){try{y.recordEffectLog(e)}catch{}},metrics(e){ge.record("executor",e)},span(e){try{y.recordEffectSpan(e)}catch{}}};let A,n,N,T,c,_,x,E;const ve=d.get(await C(Ue.layer(je??(()=>{})),pe),Ue),O=m.makeUnsafe(),K=k(e=>a.runPromise(m.close(O,e===void 0?h.void:h.fail(e))));w(()=>K(void 0));const V=t(()=>{N&&a.runPromise(a.forkIn(N.prepare,O,{startImmediately:!0})).catch(()=>{})},"prepareRuntime"),Ee=m.makeUnsafe(),X=k(async e=>{try{await c?.close(e)}finally{await a.runPromise(m.close(Ee,e===void 0?h.void:h.fail(e)))}});w(()=>X(void 0));const Q=m.makeUnsafe(),J=k(e=>a.runPromise(m.close(Q,e===void 0?h.void:h.fail(e))));w(()=>J(void 0));const Se=m.makeUnsafe(),Z=k(e=>a.runPromise(m.close(Se,e===void 0?h.void:h.fail(e))));w(()=>Z(void 0));const Pe=m.makeUnsafe(),$=k(async e=>{try{await n?.close(e)}finally{await a.runPromise(m.close(Pe,e===void 0?h.void:h.fail(e)))}});w(()=>$(void 0));try{const e={...process.env},i={...P,...z.environment},U=typeof b=="object"?br(b):Ir(b,{parse:_r});u?.throwIfAborted(),s()?.markStart("harness.product");const Qe=await C(Be.layer({projection:U.projection,baseConfiguration:b===void 0?void 0:{},packageRoot:he.productRoot??I.dirname(he.packageJsonPath),clientIdentity:{ideName:l.ideName,ideType:l.ideType,ideVersion:l.ideVersion,...l.userAgent===void 0?{}:{userAgent:l.userAgent}},environment:t(()=>({...e,...i}),"environment")}),Ee);c=await(f.createProductManager??((r,o)=>Dr.create(r,o)))({bootstrap:U.bootstrap,projection:U.projection,resolver:d.get(Qe,Be)},u),s()?.markEnd("harness.product");const Je=t(()=>{if(!c)throw new Error("Product manager is not ready");return c.getLaunchSnapshot()},"productLaunch");u?.throwIfAborted(),s()?.markStart("harness.config");const Ze=await C(ae.layer.pipe(p.provide(F)),Q);s()?.markEnd("harness.config");const re=d.get(Ze,ae),Ae=t((r,o)=>Hr(re,r,o),"sessionConfigDefaults");u?.throwIfAborted(),s()?.markStart("harness.settings"),_=await(f.createSettingsRuntime??Nr)({ambientEnvironment:e,config:re,environment:i,observe:t(r=>y.recordEffectLog({annotations:{component:"harness",operation:"refresh",reason:r.reason,resource:"policy","runtime.role":"harness",status:r.status,...r.policy===void 0?{}:{mode:r.policy.mode,noProxyCount:r.policy.noProxyCount,proxyConfigured:r.policy.proxyConfigured,proxySupport:r.policy.proxySupport,revision:r.policy.revision}},level:r.status==="failed"?"warn":"info",message:"harness.settings.proxy"}),"observe"),processRuntime:g}),s()?.markEnd("harness.settings");const ke=Fr.layer(I.join(e.CODEBUDDY_CONFIG_DIR?.trim()?I.resolve(e.CODEBUDDY_CONFIG_DIR.trim()):I.join(Le(),".codebuddy"),"harness","sessions"));u?.throwIfAborted(),s()?.markStart("harness.session-runtime");const _e=process.platform==="linux"?e[xe]??((await import("#agent-harness-components/session-config")).isLinuxSandboxCLIInstalled()?"1":"0"):void 0,be=await C(f.sessionRuntimeLayer??Or({checkpoints:!0,headers:Sr(l),prepareSandboxCenter:t((r,o)=>z.prepare(r.account?.uid,o),"prepareSandboxCenter"),resolveOptions:t(r=>a.map(Ur(r),o=>({...o,...de===void 0?{}:{tools:de},...ve===void 0?{}:{mods:ve.bridge}})),"resolveOptions"),resolveConfigDefaults:t(r=>a.tryPromise({try:t(()=>Ae(r.workspace?.canonicalCwd??r.cwd??process.cwd(),r.signal),"try"),catch:t(o=>o,"catch")}),"resolveConfigDefaults")}).pipe(p.provideMerge(ze.layer({product:{},fs:Ne,settingSources:["user","project","local"],env:{...Er(l),CODEBUDDY_API_KEY_DISABLED:"1",CODEBUDDY_REMOTE_CONFIG_DISABLED:"1",CODEBUDDY_INCLUDE_TOPIC_MESSAGE:"true",..._e===void 0?{}:{[xe]:_e},...z.environment,CODEBUDDY_CODE_DISABLE_FILE_CHECKPOINTING:e.CODEBUDDY_CODE_DISABLE_FILE_CHECKPOINTING??"0"}})),p.provide(ke)),O);s()?.markEnd("harness.session-runtime"),N=d.get(be,zr),u?.throwIfAborted(),s()?.markStart("harness.replay");const $e=d.get(await C(We.layer({},r=>Ne.readFileBuffer(r),Ae).pipe(p.provide(ke)),O),We);s()?.markEnd("harness.replay"),u?.throwIfAborted(),s()?.markStart("harness.storage");const De=await C(p.mergeAll(Ye.layer,Oe.layer).pipe(p.provide(Br.layer),p.provide(F)),O);s()?.markEnd("harness.storage");const er=d.get(De,Ye),rr=d.get(De,Oe);T=(f.createMcpIntegration??(r=>lr({containment:r.containment,recordEffectTelemetry:r.recordEffectTelemetry,recordLifecycle:r.recordLifecycle,supervisor:{environment:r.environment,toolsSyncTtlMs:Ve?.toolsSyncTtlMs,proxyPolicy:r.proxyPolicy}})))({containment:L,environment:i,proxyPolicy:qe(_.currentProxyPolicy,i),recordEffectTelemetry:Xe,recordLifecycle:M}),x=_.subscribe(r=>{const o=qe(r,i);T?.configureProxy?.(o).catch(()=>{y.recordEffectLog({annotations:{component:"harness",operation:"update",resource:"policy","runtime.role":"harness",status:"failed"},level:"warn",message:"harness.settings.proxy"})})});const Me=sr.getOrUndefined(d.getOption(be,ze));u?.throwIfAborted(),s()?.markStart("harness.mcp-services");const te=await C(p.mergeAll(Fe.layer({environment:t(()=>({...e,...i}),"environment")}),He.layer).pipe(p.provideMerge(se.layer({environment:t(()=>({...e,...i}),"environment"),product:t(()=>c.getConfiguration(),"product"),writeContext:t(async()=>{await n?.prepareHostExecution(B.signal);const r=t(()=>({environment:{...e,...i},product:structuredClone(c.getConfiguration()),authentication:n?.currentSessionAuthentication()}),"capture");return n?n.runConsistentRead(r):r()},"writeContext"),onConfigChange:Me?async(r,o)=>{const v=o.authentication;Me.notifyConfigChange({source:r.source,filePath:r.file_path,cwd:r.cwd},{product:o.product,environment:o.environment,fetch:t((ne,W)=>fr(ne,W,o.environment),"fetch"),auth:v?{accessToken:v.credential.accessToken,method:v.credential.type,refresh:t(async({signal:ne})=>{if(!n||!c)throw new Error("Hook authentication is unavailable");const W=t(()=>{if(!ar(o.product,c.getConfiguration()))throw new Error("Hook Product changed")},"checkProduct");await n.runConsistentRead(W);const Re=await n.refreshHostAuthentication(v,ne);return await n.runConsistentRead(W),{accessToken:Re.credential.accessToken,method:Re.credential.type}},"refresh")}:void 0,account:v?{uid:v.account.id,enterpriseId:v.account.organization?.id}:void 0}).catch(()=>a.runSync(a.logWarning("harness.config-change.failed").pipe(a.provide(F))))}:void 0,reloadUserConfig:t(r=>A?.reloadUserConfig(r)??Promise.resolve(),"reloadUserConfig")})),p.provide(F)),Se);s()?.markEnd("harness.mcp-services"),u?.throwIfAborted(),s()?.markStart("harness.agent-facade"),A=await(f.createAgentFacade??dr)({userMcp:d.get(te,Fe),pluginMcp:d.get(te,He),checkpoints:rr,sessions:er,initialProductGeneration:Je().productGeneration,mcpIntegration:T,strictMcpConfig:Ke,onPermanentFailure:t(r=>{j(r,"fused","recovery_failed"),B.abort(r)},"onPermanentFailure"),prepareSessionRuntime:t((r,o)=>{if(!n)throw new Error("Authentication runtime is not ready");return n.prepareSessionRuntime(r,o.connectionSignal)},"prepareSessionRuntime"),prepareSessionWorkspace:t(async(r,o)=>{if(!n||!c)throw new Error("Product manager is not ready");try{return await c.prepareWorkspace(r,{signal:o})}catch(v){if(!(v instanceof Mr&&v.code==="AUTH_REFRESH_REQUIRED"))throw v;return await n.refreshProductAuthentication(o),c.prepareWorkspace(r,{force:!0,signal:o})}},"prepareSessionWorkspace"),releaseSessionWorkspace:t((r,o)=>c?c.releaseWorkspace(r,o):Promise.resolve(),"releaseSessionWorkspace"),refreshAuthentication:t((r,o)=>{if(!n)throw new Error("Authentication runtime is not ready");return n.refreshAuthentication(r,{signal:o?.signal??AbortSignal.abort(new Error("Authentication refresh has no operation signal"))})},"refreshAuthentication"),serverInfo:fe,sessionRuntime:N,sessionReplay:$e}),s()?.markEnd("harness.agent-facade");const Ie=Cr({facade:A,onExecutionProductCommitted:V,product:c});u?.throwIfAborted(),s()?.markStart("harness.auth-service");const tr=await C(f.managedAuthLayer??ur({...c.resolveLoginProduct?{resolveLoginProduct:t((r,o)=>c.resolveLoginProduct(r,o),"resolveLoginProduct")}:{},environment:t(()=>({...e,...i}),"environment"),product:t(()=>c.getConfiguration(),"product")}).pipe(p.provide(F)),Pe);s()?.markEnd("harness.auth-service"),n=Pr({consumer:A,getAuthMethods:t(()=>c.getAuthMethods(),"getAuthMethods"),managedAuth:d.get(tr,pr),onRuntimePreparing:V,onRuntimePrepared:V,productLifecycle:Ie});const S=await mr(n);n.bindProtocolBridge(S.bridge);const oe=yr({selectConnectionProductProfile:t((r,o)=>n.selectConnectionProductProfile(r,o),"selectConnectionProductProfile"),provisionProduct:t((r,o)=>S.runAuthMutation(()=>n.provisionProduct(r,o),{signal:o.signal}),"provisionProduct"),readProduct:t((r,o)=>n.readProduct(r,o),"readProduct"),provisionWorkspaceProduct:t((r,o)=>S.runAuthMutation(()=>n.provisionWorkspaceProduct(r,o),{signal:o.signal}),"provisionWorkspaceProduct"),readWorkspaceProduct:t((r,o)=>c.readWorkspaceProduct(r,o),"readWorkspaceProduct")});c.bindPublisher({notifyProductUpdated:t(()=>oe.publisher.notifyProductUpdated(Ie.currentProductSnapshot()),"notifyProductUpdated"),notifyWorkspaceProductUpdated:t(r=>oe.publisher.notifyWorkspaceProductUpdated(r),"notifyWorkspaceProductUpdated")});const or=d.empty().pipe(d.add(Wr,_),d.add(ae,re),d.add(se,d.get(te,se)));u?.throwIfAborted(),s()?.markStart("harness.rpc-services");const nr=await le(a.provide(xr.pipe(m.provide(Q),a.provideService(p.CurrentMemoMap,me)),or));s()?.markEnd("harness.rpc-services"),E=gr([{name:"private-runtime-lifecycle",capabilities:{},initialize:t(async(r,o)=>{await ce("harness.initialize.settings",()=>_?.initialize(o.connectionSignal))},"initialize"),close:t(async r=>{x?.(),x=void 0,await Z(r),await _?.close(r),await H([[()=>K(r),()=>T?.close(r)??Promise.resolve()],[()=>G()],[()=>X(r)]],Y,"private runtime shutdown")},"close")},cr({v2:A}),hr({backend:A}),Yr({backend:A}),oe,{name:S.name,capabilities:S.capabilities,initialize:t(async(r,o)=>ce("harness.initialize.auth",()=>S.initialize(r,o)),"initialize"),initialized:S.initialized,notificationHandlers:S.notificationHandlers,requestHandlers:S.requestHandlers,close:$},{...nr,close:J}])}catch(e){throw x?.(),x=void 0,M({component:"server",error:e,phase:"startup",process:{pid:process.pid},reason:"startup_failed",state:"startup_failed"}),await H([[()=>J(e)],[()=>$(e)],[()=>A?.close(e)??Promise.resolve(),()=>K(e)],[()=>T?.close(e)??Promise.resolve()],[()=>Z(e)],[()=>_?.close(e)??Promise.resolve()],[()=>G()],[()=>X(e)]],Y,"module startup cleanup").catch(()=>{}),e}let ee;try{u?.throwIfAborted(),ee=(f.createServer??(e=>new Lr(e)))({serverInfo:fe,capabilities:E.capabilities,initializeHookTimeoutMs:Ar+wr+Tr,initialize:t(async(e,i)=>(s()?.markEnd("harness.wait-initialize"),ce("harness.initialize",()=>E.initialize(e,i))),"initialize"),initialized:E.initialized,notificationHandlers:E.notificationHandlers,onContainmentFailure:t(e=>{j(e,"containment_tripped","containment_failed"),B.abort(e)},"onContainmentFailure"),readinessSignal:L.signal,requestHandlers:E.requestHandlers,telemetryRuntime:y})}catch(e){M({component:"server",error:e,phase:"startup",process:{pid:process.pid},reason:"startup_failed",state:"startup_failed"});try{await H([[()=>E.close(e)]],Y,"server construction cleanup")}catch(i){M({component:"server",error:i,phase:"cleanup",process:{pid:process.pid},reason:"cleanup_failed",state:"shutdown_failed"})}throw e}let Ce;const we=t(e=>Ce??=H([[()=>ee.close(e),()=>E.close(e)]],D,"application services shutdown"),"close");return w(()=>Ce?Promise.resolve():we()),{server:ee,modules:E,telemetry:y,containment:L,runtimeShutdown:B,recordLifecycle:M,close:we}}t(Xr,"acquireApplicationServices");

package/lib/cli/main.js

@@ -1,3 +1,3 @@
-var x=Object.defineProperty;var c=(e,t)=>x(e,"name",{value:t,configurable:!0});import{readFileSync as $}from"node:fs";import{homedir as N}from"node:os";import*as v from"node:path";import{closeAll as B,closeHarnessProcessRuntime as P,closeInPhases as S,closeWithLifecycleTelemetry as F,createCloseOnce as _,resolveShutdownCoordinator as J,runUntilClosed as L,withNativeShutdownTimeout as V}from"../application/lifecycle.js";import{createApplicationServices as j}from"../application/services.js";import{buildAgentHarnessClientIdentityEnv as W,resolveAgentHarnessClientIdentity as z}from"../runtime/client-identity.js";import{createDailyJsonlFileSink as U}from"../telemetry/daily-jsonl-file-sink.js";import{startupProfiler as O}from"../telemetry/startup-profile.js";import{createBearerTokenAuthenticator as Y,createSignedBearerTokenAuthenticator as q}from"../transport/auth.js";import{parseAgentHarnessListenAddress as G}from"../transport/listen.js";import{createAgentHarnessNetworkListener as K}from"../transport/network.js";import{serveStdio as Q}from"../transport/stdio.js";import{parseAgentHarnessCliOptions as X}from"./options.js";import{traceShutdown as D}from"./shutdown-diagnostics.js";export function resolveAgentHarnessProgramConfig(e,t={}){const r=X(e),s=t.packageVersion??ne();if(r.help||r.version)return{cli:r,packageVersion:s};const o=(t.parseListenAddress??G)(r.listen);return Z(r,o),{cli:r,listen:o,packageVersion:s}}c(resolveAgentHarnessProgramConfig,"resolveAgentHarnessProgramConfig");export async function startAgentHarnessProgramApplication(e,t={},r={}){if(e.listen===void 0||e.listen.kind==="off")throw new Error("Agent Harness application cannot start without a listener");const s=J(t),o=r.processRuntime===void 0,n=r.processRuntime??await(t.createProcessRuntime??(await import("../effect-runtime/process-runtime.mjs")).createHarnessProcessRuntime)();try{const a=ee({cli:e.cli,dependencies:t,listen:e.listen,packageVersion:e.packageVersion,processRuntime:n,shutdown:s,stderr:t.stderr??process.stderr});let i;return{close:c((f,p)=>(i??=te(a,f,p),i),"close"),running:a.running}}catch(a){if(!o)throw a;s.start();try{await P(n,s)}catch(i){throw new AggregateError([a,i],"Agent Harness startup and cleanup both failed")}throw a}}c(startAgentHarnessProgramApplication,"startAgentHarnessProgramApplication");export async function runAgentHarnessCli(e=process.argv.slice(2),t={}){const[{Effect:r},{makeHarnessCliMain:s}]=await Promise.all([import("effect"),import("./program.mjs")]);await r.runPromise(s(e,t))}c(runAgentHarnessCli,"runAgentHarnessCli");function Z(e,t){if((t.kind==="stdio"||t.kind==="off")&&e.wsAuth!==void 0)throw new Error(`--ws-auth cannot be used with ${t.address}`);if((t.kind==="stdio"||t.kind==="off")&&e.allowedOrigins.length>0)throw new Error(`--allowed-origin cannot be used with ${t.address}`);if(t.kind==="npipe"&&e.wsAuth===void 0)throw new Error("Windows named-pipe listeners require --ws-auth");if(t.kind!=="streamable-http"&&t.kind!=="websocket"&&e.allowInsecureRemote)throw new Error(`--allow-insecure-remote cannot be used with ${t.address}`)}c(Z,"validateHarnessListenOptions");function ee({cli:e,dependencies:t,listen:r,packageVersion:s,processRuntime:o,shutdown:n,stderr:a}){const i=new AbortController,f=new Error("Agent Harness is shutting down"),p=o.run(async g=>{let d;e.wsAuth==="capability-token"?d=await(t.createTokenAuthenticator??Y)({tokenFile:e.wsTokenFile,tokenSha256:e.wsTokenSha256}):e.wsAuth==="signed-bearer-token"&&(d=await(t.createSignedTokenAuthenticator??q)({audience:e.wsAudience,issuer:e.wsIssuer,maxClockSkewSeconds:e.wsMaxClockSkewSeconds,sharedSecretFile:e.wsSharedSecretFile}));const k=z(e.clientIdentity,s);await re({allowInsecureRemote:e.allowInsecureRemote,allowedOrigins:e.allowedOrigins,authenticator:d,clientIdentity:k,clientIdentityEnv:W(k),dependencies:t,gracefulShutdownSignal:i.signal,listen:r,logDir:e.logDir,packageVersion:s,processRuntime:o,processSignal:g,productConfig:e.productConfig,strictMcpConfig:e.strictMcpConfig,shutdown:n,stderr:a})});return p.catch(()=>{}),{closeReason:f,closeSignal:i,processRuntime:o,running:p,shutdown:n}}c(ee,"startHarnessApplication");async function te(e,t,r){D("application","started"),e.shutdown.start(),e.closeSignal.abort(e.closeReason);let s,o=!1;try{const i=Math.max(1,e.shutdown.remainingMs());await V(e.running,i,"application shutdown")}catch(i){s=i,o=!0}let n,a=!1;try{await P(e.processRuntime,e.shutdown,t)}catch(i){n=i,a=!0}if(!r&&o&&a)throw new AggregateError([s,n],"Agent Harness runtime and cleanup both failed");if(!r&&o)throw s;if(a)throw n;D("application","completed")}c(te,"closeHarnessApplication");async function re({allowInsecureRemote:e,allowedOrigins:t,authenticator:r,clientIdentity:s,clientIdentityEnv:o,dependencies:n,listen:a,logDir:i,packageVersion:f,processRuntime:p,processSignal:g,gracefulShutdownSignal:d,productConfig:k,strictMcpConfig:M,shutdown:C,stderr:H}){const w=C,{server:m,modules:A,telemetry:E,containment:T,runtimeShutdown:R,recordLifecycle:h}=await j({clientIdentity:s,clientIdentityEnv:o,dependencies:n,packageVersion:f,processRuntime:p,productConfig:k,strictMcpConfig:M,shutdown:C,telemetryOptions:se(n,i)});if(O()?.markEvent("harness-services-ready"),O()?.markStart("harness.wait-initialize","Transport setup and wait for first initialize"),a.kind==="stdio"){let l;try{l=(n.serveStdio??Q)(m)}catch(u){throw await S([[()=>m.close(u),()=>A.close(u)]],w,"stdio construction cleanup").catch(()=>{}),h({component:"server",error:u,phase:"startup",process:{pid:process.pid},reason:"startup_failed",state:"startup_failed"}),u}const I=_(u=>l.close(u));h({component:"server",phase:"startup",process:{pid:process.pid},reason:"startup_completed",state:"started"}),await L(l.closed,u=>F(E,()=>B([()=>I(u),()=>m.close(u),()=>A.close(u)],w,"stdio shutdown")),n.signalTarget,d,[T.signal,R.signal,g],{forceClose:c(u=>I(u),"forceClose"),timeouts:w}),h({component:"server",phase:"shutdown",process:{pid:process.pid},reason:"shutdown_completed",state:"stopped"});return}let y;try{y=await(n.createNetworkListener??K)({acceptor:m,allowInsecureRemote:e,allowedOrigins:t,listen:a,authenticator:r,onWarning:c(l=>H.write(`[agent-harness] warning: ${l}
-`),"onWarning")})}catch(l){throw await S([[()=>m.close(l),()=>A.close(l)]],w,"listener construction cleanup").catch(()=>{}),h({component:"server",error:l,phase:"startup",process:{pid:process.pid},reason:"startup_failed",state:"startup_failed"}),l}H.write(`[agent-harness] listening on ${y.address}
-`);const b=_(()=>y.close());h({component:"server",phase:"startup",process:{pid:process.pid},reason:"startup_completed",state:"started"}),await L(y.closed,l=>F(E,()=>S([[()=>m.close(l),()=>A.close(l)],[()=>b()]],w,"network shutdown")),n.signalTarget,d,[T.signal,R.signal,g],{forceClose:c(()=>b(),"forceClose"),timeouts:w}),h({component:"server",phase:"shutdown",process:{pid:process.pid},reason:"shutdown_completed",state:"stopped"})}c(re,"runAgentHarnessCliRuntime");function se(e,t){if(e.telemetry!==void 0)return e.telemetry;if(process.env.DISABLE_TELEMETRY)return{};try{const r=process.env.CODEBUDDY_CONFIG_DIR?.trim(),s=t??v.join(r?v.resolve(r):v.join(N(),".codebuddy"),"logs","harness");return{sink:(e.createTelemetryFileSink??U)({directory:s})}}catch{return{}}}c(se,"resolveCliTelemetry");function ne(){const e=v.resolve(import.meta.dirname,"../../package.json"),t=JSON.parse($(e,"utf8"));if(typeof t.version!="string"||t.version.length===0)throw new Error(`Agent Harness package version is missing in ${e}`);return t.version}c(ne,"readPackageVersion");
+var M=Object.defineProperty;var c=(e,t)=>M(e,"name",{value:t,configurable:!0});import{readFileSync as x}from"node:fs";import{homedir as $}from"node:os";import*as y from"node:path";import{closeAll as N,closeHarnessProcessRuntime as I,closeInPhases as B,closeWithLifecycleTelemetry as P,createCloseOnce as F,resolveShutdownCoordinator as J,runUntilClosed as _,withNativeShutdownTimeout as V}from"../application/lifecycle.js";import{createApplicationServices as j}from"../application/services.js";import{buildAgentHarnessClientIdentityEnv as W,resolveAgentHarnessClientIdentity as z}from"../runtime/client-identity.js";import{createDailyJsonlFileSink as U}from"../telemetry/daily-jsonl-file-sink.js";import{startupProfiler as L}from"../telemetry/startup-profile.js";import{createBearerTokenAuthenticator as Y,createSignedBearerTokenAuthenticator as q}from"../transport/auth.js";import{parseAgentHarnessListenAddress as G}from"../transport/listen.js";import{createAgentHarnessNetworkListener as K}from"../transport/network.js";import{serveStdio as Q}from"../transport/stdio.js";import{parseAgentHarnessCliOptions as X}from"./options.js";import{traceShutdown as O}from"./shutdown-diagnostics.js";export function resolveAgentHarnessProgramConfig(e,t={}){const r=X(e),s=t.packageVersion??ne();if(r.help||r.version)return{cli:r,packageVersion:s};const a=(t.parseListenAddress??G)(r.listen);return Z(r,a),{cli:r,listen:a,packageVersion:s}}c(resolveAgentHarnessProgramConfig,"resolveAgentHarnessProgramConfig");export async function startAgentHarnessProgramApplication(e,t={},r={}){if(e.listen===void 0||e.listen.kind==="off")throw new Error("Agent Harness application cannot start without a listener");const s=J(t),a=r.processRuntime===void 0,n=r.processRuntime??await(t.createProcessRuntime??(await import("../effect-runtime/process-runtime.mjs")).createHarnessProcessRuntime)();try{const i=ee({cli:e.cli,dependencies:t,listen:e.listen,packageVersion:e.packageVersion,processRuntime:n,shutdown:s,stderr:t.stderr??process.stderr});let o;return{close:c((m,p)=>(o??=te(i,m,p),o),"close"),running:i.running}}catch(i){if(!a)throw i;s.start();try{await I(n,s)}catch(o){throw new AggregateError([i,o],"Agent Harness startup and cleanup both failed")}throw i}}c(startAgentHarnessProgramApplication,"startAgentHarnessProgramApplication");export async function runAgentHarnessCli(e=process.argv.slice(2),t={}){const[{Effect:r},{makeHarnessCliMain:s}]=await Promise.all([import("effect"),import("./program.mjs")]);await r.runPromise(s(e,t))}c(runAgentHarnessCli,"runAgentHarnessCli");function Z(e,t){if((t.kind==="stdio"||t.kind==="off")&&e.wsAuth!==void 0)throw new Error(`--ws-auth cannot be used with ${t.address}`);if((t.kind==="stdio"||t.kind==="off")&&e.allowedOrigins.length>0)throw new Error(`--allowed-origin cannot be used with ${t.address}`);if(t.kind==="npipe"&&e.wsAuth===void 0)throw new Error("Windows named-pipe listeners require --ws-auth");if(t.kind!=="streamable-http"&&t.kind!=="websocket"&&e.allowInsecureRemote)throw new Error(`--allow-insecure-remote cannot be used with ${t.address}`)}c(Z,"validateHarnessListenOptions");function ee({cli:e,dependencies:t,listen:r,packageVersion:s,processRuntime:a,shutdown:n,stderr:i}){const o=new AbortController,m=new Error("Agent Harness is shutting down"),p=a.run(async h=>{let d;e.wsAuth==="capability-token"?d=await(t.createTokenAuthenticator??Y)({tokenFile:e.wsTokenFile,tokenSha256:e.wsTokenSha256}):e.wsAuth==="signed-bearer-token"&&(d=await(t.createSignedTokenAuthenticator??q)({audience:e.wsAudience,issuer:e.wsIssuer,maxClockSkewSeconds:e.wsMaxClockSkewSeconds,sharedSecretFile:e.wsSharedSecretFile}));const f=z(e.clientIdentity,s);await re({allowInsecureRemote:e.allowInsecureRemote,allowedOrigins:e.allowedOrigins,authenticator:d,clientIdentity:f,clientIdentityEnv:W(f),dependencies:t,gracefulShutdownSignal:o.signal,listen:r,logDir:e.logDir,packageVersion:s,processRuntime:a,processSignal:h,productConfig:e.productConfig,strictMcpConfig:e.strictMcpConfig,shutdown:n,stderr:i})});return p.catch(()=>{}),{closeReason:m,closeSignal:o,processRuntime:a,running:p,shutdown:n}}c(ee,"startHarnessApplication");async function te(e,t,r){O("application","started"),e.shutdown.start(),e.closeSignal.abort(e.closeReason);let s,a=!1;try{const o=Math.max(1,e.shutdown.remainingMs());await V(e.running,o,"application shutdown")}catch(o){o!==e.closeReason&&(s=o,a=!0)}let n,i=!1;try{await I(e.processRuntime,e.shutdown,t)}catch(o){n=o,i=!0}if(!r&&a&&i)throw new AggregateError([s,n],"Agent Harness runtime and cleanup both failed");if(!r&&a)throw s;if(i)throw n;O("application","completed")}c(te,"closeHarnessApplication");async function re({allowInsecureRemote:e,allowedOrigins:t,authenticator:r,clientIdentity:s,clientIdentityEnv:a,dependencies:n,listen:i,logDir:o,packageVersion:m,processRuntime:p,processSignal:h,gracefulShutdownSignal:d,productConfig:f,strictMcpConfig:D,shutdown:v,stderr:C}){const g=v,{server:S,close:k,telemetry:H,containment:E,runtimeShutdown:R,recordLifecycle:w}=await j({clientIdentity:s,clientIdentityEnv:a,dependencies:n,packageVersion:m,processRuntime:p,productConfig:f,strictMcpConfig:D,shutdown:v,telemetryOptions:se(n,o),signal:AbortSignal.any([h,d])});if(L()?.markEvent("harness-services-ready"),L()?.markStart("harness.wait-initialize","Transport setup and wait for first initialize"),i.kind==="stdio"){let l;try{l=(n.serveStdio??Q)(S)}catch(u){throw await k(u).catch(()=>{}),w({component:"server",error:u,phase:"startup",process:{pid:process.pid},reason:"startup_failed",state:"startup_failed"}),u}const b=F(u=>l.close(u));w({component:"server",phase:"startup",process:{pid:process.pid},reason:"startup_completed",state:"started"}),await _(l.closed,u=>P(H,()=>N([()=>b(u),()=>k(u)],g,"stdio shutdown")),n.signalTarget,d,[E.signal,R.signal,h],{forceClose:c(u=>b(u),"forceClose"),timeouts:g}),w({component:"server",phase:"shutdown",process:{pid:process.pid},reason:"shutdown_completed",state:"stopped"});return}let A;try{A=await(n.createNetworkListener??K)({acceptor:S,allowInsecureRemote:e,allowedOrigins:t,listen:i,authenticator:r,onWarning:c(l=>C.write(`[agent-harness] warning: ${l}
+`),"onWarning")})}catch(l){throw await k(l).catch(()=>{}),w({component:"server",error:l,phase:"startup",process:{pid:process.pid},reason:"startup_failed",state:"startup_failed"}),l}C.write(`[agent-harness] listening on ${A.address}
+`);const T=F(()=>A.close());w({component:"server",phase:"startup",process:{pid:process.pid},reason:"startup_completed",state:"started"}),await _(A.closed,l=>P(H,()=>B([[()=>k(l)],[()=>T()]],g,"network shutdown")),n.signalTarget,d,[E.signal,R.signal,h],{forceClose:c(()=>T(),"forceClose"),timeouts:g}),w({component:"server",phase:"shutdown",process:{pid:process.pid},reason:"shutdown_completed",state:"stopped"})}c(re,"runAgentHarnessCliRuntime");function se(e,t){if(e.telemetry!==void 0)return e.telemetry;if(process.env.DISABLE_TELEMETRY)return{};try{const r=process.env.CODEBUDDY_CONFIG_DIR?.trim(),s=t??y.join(r?y.resolve(r):y.join($(),".codebuddy"),"logs","harness");return{sink:(e.createTelemetryFileSink??U)({directory:s})}}catch{return{}}}c(se,"resolveCliTelemetry");function ne(){const e=y.resolve(import.meta.dirname,"../../package.json"),t=JSON.parse(x(e,"utf8"));if(typeof t.version!="string"||t.version.length===0)throw new Error(`Agent Harness package version is missing in ${e}`);return t.version}c(ne,"readPackageVersion");

package/lib/client/rpc.d.ts

@@ -62,6 +62,22 @@ export declare const clientMethods: {
         readonly upgrade: "marketplace/upgrade";
     };
     readonly mcpServer: {
+        readonly oauth: {
+            readonly cancel: "mcpServer/oauth/cancel";
+        };
+    } & {
+        readonly oauth: {
+            readonly complete: "mcpServer/oauth/complete";
+        };
+    } & {
+        readonly oauth: {
+            readonly login: "mcpServer/oauth/login";
+        };
+    } & {
+        readonly oauth: {
+            readonly logout: "mcpServer/oauth/logout";
+        };
+    } & {
         readonly startupStatus: {
             readonly updated: "mcpServer/startupStatus/updated";
         };

package/lib/components/functional-hooks.d.mts

@@ -0,0 +1,4 @@
+export { createFunctionalHooks } from '../../cli/dist-server/types/node/hooks/functional-hooks.js';
+export type { FunctionalHooks, FunctionalHooksHost } from '../../cli/dist-server/types/node/hooks/functional-hooks.js';
+export type { FunctionalHooksRegister as HarnessHooks, FunctionalHookApi as HarnessHookApi, FunctionalHookOn as HarnessHookOn, } from '../../cli/dist-server/types/node/hooks/functional-hooks-protocol.js';
+export { currentModsExecutionContext } from '../../cli/dist-server/types/vendor/cbc-core/node/index.js';

package/lib/components/functional-hooks.mjs

@@ -0,0 +1 @@
+import o from"#agent-harness-runtime";const t=o["component-functional-hooks"]();export const{createFunctionalHooks,currentModsExecutionContext}=t;

package/lib/harness/create-harness.js

@@ -1 +1 @@
-var l=Object.defineProperty;var r=(e,n)=>l(e,"name",{value:n,configurable:!0});import{isAbsolute as b}from"node:path";const o=Symbol.for("codebuddy.ai/agent-harness/application-owner");export async function createHarness(e={}){if(e.signal?.throwIfAborted(),e.configDir!==void 0&&!b(e.configDir))throw new TypeError("Harness configDir must be an absolute path");if(typeof e.sandboxCenter=="object"&&!e.sandboxCenter.address?.trim())throw new TypeError("sandboxCenter.address must be a non-empty IPC address");const n=globalThis;if(n[o]!==void 0)throw new Error("This process already owns a Harness. Reuse it for additional Clients and Sessions, or await its close() before creating another.");const d={};n[o]=d;const i=process.env.CODEBUDDY_CONFIG_DIR;e.configDir!==void 0&&(process.env.CODEBUDDY_CONFIG_DIR=e.configDir);const f=r(()=>{n[o]===d&&(delete n[o],e.configDir!==void 0&&process.env.CODEBUDDY_CONFIG_DIR===e.configDir&&(i===void 0?delete process.env.CODEBUDDY_CONFIG_DIR:process.env.CODEBUDDY_CONFIG_DIR=i))},"release");try{const t={...e,host:e.host===void 0?void 0:{...e.host},productConfig:typeof e.productConfig=="object"?structuredClone(e.productConfig):e.productConfig,sandboxCenter:typeof e.sandboxCenter=="object"?{...e.sandboxCenter}:e.sandboxCenter},{startHarness:u}=await import("./runtime.js"),s=await u(t),c=s.closed.then(f);c.catch(()=>{});const D=r(()=>(s.close().catch(()=>{}),c),"close");return{get ready(){return s.ready},connect:r((a,C)=>s.connect(a,C),"connect"),connectInMemory:r(a=>s.connectInMemory(a),"connectInMemory"),closed:c,close:D,[Symbol.asyncDispose]:D}}catch(t){throw f(),t}}r(createHarness,"createHarness");
+var D=Object.defineProperty;var n=(e,t)=>D(e,"name",{value:t,configurable:!0});import{isAbsolute as m}from"node:path";const a=Symbol.for("codebuddy.ai/agent-harness/application-owner");function g(e){if(e===void 0)return;if(!Array.isArray(e))throw new TypeError("Harness tools must be an array of tool() definitions. Select tools in the plugin Agent configuration.");const t=new Set;return e.map((r,s)=>{if(!r||typeof r!="object"||typeof r.name!="string"||!r.name.trim()||typeof r.description!="string"||typeof r.handler!="function"||!r.inputSchema||typeof r.inputSchema!="object"||Array.isArray(r.inputSchema))throw new TypeError(`Harness tools[${s}] must be a tool() definition. Select tool names in the plugin Agent configuration.`);if(t.has(r.name))throw new TypeError(`Duplicate Harness tool name: '${r.name}'`);return t.add(r.name),{...r,inputSchema:{...r.inputSchema}}})}n(g,"captureTools");export async function createHarness(e={}){e.signal?.throwIfAborted();const t=g(e.tools);if(e.configDir!==void 0&&!m(e.configDir))throw new TypeError("Harness configDir must be an absolute path");if(typeof e.sandboxCenter=="object"&&!e.sandboxCenter.address?.trim())throw new TypeError("sandboxCenter.address must be a non-empty IPC address");const r=globalThis;if(r[a]!==void 0)throw new Error("This process already owns a Harness. Reuse it for additional Clients and Sessions, or await its close() before creating another.");const s={};r[a]=s;const f=process.env.CODEBUDDY_CONFIG_DIR;e.configDir!==void 0&&(process.env.CODEBUDDY_CONFIG_DIR=e.configDir);const i=n(()=>{r[a]===s&&(delete r[a],e.configDir!==void 0&&process.env.CODEBUDDY_CONFIG_DIR===e.configDir&&(f===void 0?delete process.env.CODEBUDDY_CONFIG_DIR:process.env.CODEBUDDY_CONFIG_DIR=f))},"release");try{const c={...e,tools:t,host:e.host===void 0?void 0:{...e.host},productConfig:typeof e.productConfig=="object"?structuredClone(e.productConfig):e.productConfig,sandboxCenter:typeof e.sandboxCenter=="object"?{...e.sandboxCenter}:e.sandboxCenter},{startHarness:h}=await import("./runtime.js"),o=await h(c),d=o.closed.then(i);d.catch(()=>{});const l=n(()=>(o.close().catch(()=>{}),d),"close");return{get ready(){return o.ready},connect:n((u,y)=>o.connect(u,y),"connect"),connectInMemory:n(u=>o.connectInMemory(u),"connectInMemory"),closed:d,close:l,[Symbol.asyncDispose]:l}}catch(c){throw i(),c}}n(createHarness,"createHarness");

package/lib/harness/hooks.d.ts

@@ -0,0 +1,8 @@
+import { Context, Layer } from 'effect';
+import type { FunctionalHooks, HarnessHooks } from '#agent-harness-components/functional-hooks';
+declare const HostHooks_base: Context.ServiceClass<HostHooks, "@genie/agent-harness/HostHooks", FunctionalHooks>;
+/** The application Scope owns registration and cancellation of Host middleware. */
+export declare class HostHooks extends HostHooks_base {
+    static layer(register: HarnessHooks): Layer.Layer<HostHooks, unknown>;
+}
+export {};

package/lib/harness/hooks.js

@@ -0,0 +1 @@
+var l=Object.defineProperty;var o=(r,t)=>l(r,"name",{value:t,configurable:!0});import{Context as y,Effect as e,Layer as u}from"effect";export class HostHooks extends y.Service()("@genie/agent-harness/HostHooks"){static{o(this,"HostHooks")}static layer(t){return u.effect(this,e.gen(function*(){const{createFunctionalHooks:s,currentModsExecutionContext:i}=yield*e.tryPromise(()=>import("#agent-harness-components/functional-hooks")),c=e.runSyncWith(yield*e.context()),a=yield*e.acquireRelease(e.sync(()=>new AbortController),n=>e.sync(()=>n.abort(new Error("Harness hooks closed"))));return yield*e.tryPromise(()=>s(t,{name:"harness",signal:a.signal,getSession:i,report:o(n=>c(e.logWarning(n)),"report")}))}))}}

package/lib/harness/runtime.js

@@ -1 +1 @@
-var H=Object.defineProperty;var i=(e,s)=>H(e,"name",{value:s,configurable:!0});import{readFileSync as S}from"node:fs";import{closeHarnessProcessRuntime as P,closeInPhases as v,closeWithLifecycleTelemetry as M,resolveShutdownCoordinator as R,runUntilClosed as L}from"../application/lifecycle.js";import{createApplicationServices as k}from"../application/services.js";import{createHarnessProcessRuntime as x}from"../effect-runtime/process-runtime.mjs";import{buildAgentHarnessClientIdentityEnv as T,resolveAgentHarnessClientIdentity as N}from"../runtime/client-identity.js";import{startupProfiler as O}from"../telemetry/startup-profile.js";export async function startHarness(e,s={}){e.signal?.throwIfAborted();const l=e.mcp?.toolsSyncTtlMs;if(l!=null&&(!Number.isSafeInteger(l)||l<=0))throw new RangeError("mcp.toolsSyncTtlMs must be a positive integer or null");const g=s.packageVersion??JSON.parse(S(new URL("../../package.json",import.meta.url),"utf8")).version,p=N(e.host??{},g),a=R(s),m=await(s.createProcessRuntime??x)(),w=Promise.withResolvers(),n=new AbortController,d=new Error("Agent Harness is shutting down"),u=i(()=>n.abort(e.signal?.reason??d),"cancel");e.signal?.addEventListener("abort",u,{once:!0}),e.signal?.aborted&&u();const I=Promise.resolve().then(()=>m.run(async t=>{n.signal.throwIfAborted();const{server:r,modules:o,telemetry:E,containment:A,runtimeShutdown:C,recordLifecycle:h}=await k({signal:AbortSignal.any([n.signal,t]),clientIdentity:p,clientIdentityEnv:T(p),dependencies:s,packageVersion:g,processRuntime:m,productConfig:e.productConfig,sandboxCenter:e.sandboxCenter,tools:e.tools,strictMcpConfig:e.strictMcpConfig??!1,mcp:e.mcp,shutdown:a,telemetryOptions:e.telemetry??{}});if(!("connectInMemory"in r)||typeof r.connectInMemory!="function")throw await v([[()=>r.close(),()=>o.close()]],a),new TypeError("Application Server does not implement the in-memory endpoint");O()?.markEvent("harness-services-ready"),h({component:"server",phase:"startup",process:{pid:process.pid},reason:"startup_completed",state:"started"}),w.resolve(r),await L(new Promise(()=>{}),b=>M(E,()=>v([[()=>r.close(b),()=>o.close(b)]],a,"in-memory shutdown")),void 0,n.signal,[A.signal,C.signal,t],{timeouts:a}),h({component:"server",phase:"shutdown",process:{pid:process.pid},reason:"shutdown_completed",state:"stopped"})})),c=(async()=>{let t,r=!1;try{await I}catch(o){t=o,r=!0}n.abort(d),a.start();try{await P(m,a)}catch(o){throw r?new AggregateError([t,o],"Harness execution and cleanup failed"):o}finally{e.signal?.removeEventListener("abort",u)}if(r)throw t})();c.catch(()=>{});const f=await Promise.race([w.promise,c.then(()=>{throw new Error("Harness closed before startup completed")})]);e.signal?.aborted&&(await c,e.signal.throwIfAborted());const y=i(()=>(n.abort(d),c),"close");return{get ready(){return!n.signal.aborted&&f.ready},closed:c,connect:i((t,r)=>{if(n.signal.aborted)throw new Error("Harness is closing");return f.connect(t,r)},"connect"),connectInMemory:i(t=>{if(n.signal.aborted)throw new Error("Harness is closing");return f.connectInMemory(t)},"connectInMemory"),close:y,[Symbol.asyncDispose]:y}}i(startHarness,"startHarness");
+var C=Object.defineProperty;var a=(e,s)=>C(e,"name",{value:s,configurable:!0});import{readFileSync as S}from"node:fs";import{closeHarnessProcessRuntime as H,closeWithLifecycleTelemetry as M,resolveShutdownCoordinator as P,runUntilClosed as R}from"../application/lifecycle.js";import{createApplicationServices as k}from"../application/services.js";import{createHarnessProcessRuntime as L}from"../effect-runtime/process-runtime.mjs";import{buildAgentHarnessClientIdentityEnv as x,resolveAgentHarnessClientIdentity as T}from"../runtime/client-identity.js";import{startupProfiler as N}from"../telemetry/startup-profile.js";export async function startHarness(e,s={}){e.signal?.throwIfAborted();const l=e.mcp?.toolsSyncTtlMs;if(l!=null&&(!Number.isSafeInteger(l)||l<=0))throw new RangeError("mcp.toolsSyncTtlMs must be a positive integer or null");const f=s.packageVersion??JSON.parse(S(new URL("../../package.json",import.meta.url),"utf8")).version,g=T(e.host??{},f),c=P(s),m=await(s.createProcessRuntime??L)(),w=Promise.withResolvers(),t=new AbortController,d=new Error("Agent Harness is shutting down"),u=a(()=>t.abort(e.signal?.reason??d),"cancel");e.signal?.addEventListener("abort",u,{once:!0}),e.signal?.aborted&&u();const b=Promise.resolve().then(()=>m.run(async r=>{t.signal.throwIfAborted();const{server:n,close:o,telemetry:v,containment:E,runtimeShutdown:I,recordLifecycle:h}=await k({signal:AbortSignal.any([t.signal,r]),clientIdentity:g,clientIdentityEnv:x(g),dependencies:s,packageVersion:f,processRuntime:m,productConfig:e.productConfig,sandboxCenter:e.sandboxCenter,tools:{type:"preset",preset:"default",append:e.tools},hooks:e.hooks,strictMcpConfig:e.strictMcpConfig??!1,mcp:e.mcp,shutdown:c,telemetryOptions:e.telemetry??{}});if(!("connectInMemory"in n)||typeof n.connectInMemory!="function")throw await o(),new TypeError("Application Server does not implement the in-memory endpoint");N()?.markEvent("harness-services-ready"),h({component:"server",phase:"startup",process:{pid:process.pid},reason:"startup_completed",state:"started"}),w.resolve(n),await R(new Promise(()=>{}),A=>M(v,()=>o(A)),void 0,t.signal,[E.signal,I.signal,r],{timeouts:c}),h({component:"server",phase:"shutdown",process:{pid:process.pid},reason:"shutdown_completed",state:"stopped"})})),i=(async()=>{let r,n=!1;try{await b}catch(o){r=o,n=!0}t.abort(d),c.start();try{await H(m,c)}catch(o){throw n?new AggregateError([r,o],"Harness execution and cleanup failed"):o}finally{e.signal?.removeEventListener("abort",u)}if(n)throw r})();i.catch(()=>{});const p=await Promise.race([w.promise,i.then(()=>{throw new Error("Harness closed before startup completed")})]);e.signal?.aborted&&(await i,e.signal.throwIfAborted());const y=a(()=>(t.abort(d),i),"close");return{get ready(){return!t.signal.aborted&&p.ready},closed:i,connect:a((r,n)=>{if(t.signal.aborted)throw new Error("Harness is closing");return p.connect(r,n)},"connect"),connectInMemory:a(r=>{if(t.signal.aborted)throw new Error("Harness is closing");return p.connectInMemory(r)},"connectInMemory"),close:y,[Symbol.asyncDispose]:y}}a(startHarness,"startHarness");

package/lib/harness/types.d.ts

@@ -1,14 +1,16 @@
-import type { QueryOptions, SdkMcpToolDefinition } from '#agent-harness-codebuddy/server';
+import type { SdkMcpToolDefinition } from '#agent-harness-codebuddy/server';
+import type { HarnessHooks } from '#agent-harness-components/functional-hooks';
 import type { AgentHarnessClientIdentity } from '../runtime/client-identity.js';
 import type { AgentHarnessProductInput } from '../runtime/product-config.js';
 import type { SandboxCenterOption } from '../runtime/sandbox-center.js';
 import type { TelemetryOptions } from '../telemetry/public.js';
 import type { InMemoryEndpoint } from '../transport/effect.js';
 import type { AgentHarnessConnectionAcceptor } from '../transport/types.js';
+export type { HarnessHooks } from '#agent-harness-components/functional-hooks';
 export type HostInfo = AgentHarnessClientIdentity;
 export type ProductConfig = AgentHarnessProductInput;
 export type ToolDefinition = SdkMcpToolDefinition;
-export type HarnessTools = NonNullable<QueryOptions['tools']>;
+export type HarnessTools = readonly ToolDefinition[];
 export interface HarnessOptions {
     readonly host?: HostInfo;
     /** Complete Host startup Product or versioned file path; omission uses bundled defaults. */
@@ -17,7 +19,10 @@ export interface HarnessOptions {
     readonly configDir?: string;
     /** Managed by Harness by default; pass an IPC address to borrow a Host-owned center. */
     readonly sandboxCenter?: SandboxCenterOption;
+    /** Register Host tools alongside the defaults; plugin Agent declarations select visible tools. */
     readonly tools?: HarnessTools;
+    /** Functional hooks: register(on, options), once per Harness. Functions stay in this process. */
+    readonly hooks?: HarnessHooks;
     readonly strictMcpConfig?: boolean;
     readonly mcp?: {
         /** Catalog fallback refresh interval. Default: 15 minutes; null disables expiry. */

package/lib/integration/agent-integration.d.ts

@@ -1,5 +1,5 @@
 import type { ExecutorPrivateProxyPolicy } from '#agent-harness-executor/private-protocol';
-import type { ExecutorMcpCallResult } from '#agent-harness-executor/types';
+import type { ExecutorMcpCallResult, ExecutorOAuthLoginInput, ExecutorOAuthLoginResult } from '#agent-harness-executor/types';
 import type { AcpV2ConnectMcpRequest, AcpV2ConnectMcpResponse, AcpV2DisconnectMcpRequest, AcpV2McpServer, AcpV2MessageMcpNotification, AcpV2MessageMcpRequest } from '../protocol/acp-v2.js';
 import { CodeBuddyProcessContainment } from '../runtime/process-containment.js';
 import type { AgentHarnessHandlerContext } from '../server/types.js';
@@ -40,6 +40,10 @@ export interface AgentMcpSessionSetup {
     readonly userMcpSnapshot?: UserMcpSnapshot;
 }
 export interface AgentMcpAttachment {
+    startOAuth?(name: string, input: ExecutorOAuthLoginInput, signal?: AbortSignal): Promise<ExecutorOAuthLoginResult>;
+    completeOAuth?(name: string, state: string, code: string, signal?: AbortSignal): Promise<void>;
+    cancelOAuth?(name: string, state: string, signal?: AbortSignal): Promise<void>;
+    logoutOAuth?(name: string, signal?: AbortSignal): Promise<void>;
     bindSessionId(sessionId: string): void;
     connect(params: AcpV2ConnectMcpRequest, options: AgentMcpConnectOptions): Promise<AcpV2ConnectMcpResponse>;
     disconnect(params: AcpV2DisconnectMcpRequest, options: AgentMcpNotificationOptions): Promise<void>;

package/lib/integration/agent-integration.js

@@ -1 +1 @@
-var w=Object.defineProperty;var a=(s,e)=>w(s,"name",{value:e,configurable:!0});import{CodeBuddyProcessContainment as M}from"../runtime/process-containment.js";import"./agent-mcp-protocol.js";import{ClientMcpAttachment as P}from"./client-mcp-attachment.js";import{ExecutorProcessSupervisor as C}from"./executor-supervisor.js";import{ExecutorMcpIntegration as y}from"./session-mcp-view.js";import{McpSourceCompiler as E}from"./source-compiler.js";const u=128;let v;function x(){return v??=import("./session-mcp-scope.js"),v}a(x,"loadSessionMcpScope");class A{static{a(this,"DefaultAgentMcpAttachment")}constructor(e){this.options=e,this.controller=new AbortController}bindSessionId(e){if(this.sessionId&&this.sessionId!==e)throw new Error("MCP attachment is already bound to another session");this.sessionId=e,this.scope?.bindSessionId(e)}async connect(e,t){return await this.materialize(),this.requireScope().connect(e,t)}async disconnect(e,t){await this.scope?.disconnect(e,t)}async disconnectPeer(e){await this.scope?.disconnectPeer(e)}listServerStatuses(){return this.requireScope().listServerStatuses()}materialize(){return this.revokePromise?Promise.reject(new Error("MCP attachment is revoked")):(this.materialization??=this.materializeInternal(),this.materialization)}revoke(){return this.revokePromise??=this.revokeInternal(),this.revokePromise}async message(e,t){return await this.materialize(),this.requireScope().message(e,t)}notify(e,t){this.requireScope().notify(e,t)}callTool(e,t,r,i){return this.requireScope().callTool(e,t,r,i)}subscribeServerStatus(e){return this.requireScope().subscribeServerStatus(e)}async materializeInternal(){try{if(this.options.servers.length+this.options.reservedServerCount>u)throw new RangeError(`ACP MCP server limit exceeds ${u}`);const e=this.options.compiler.compilePluginSnapshot(this.options.pluginMcpSnapshot),t=this.options.userMcpSnapshot?this.options.compiler.compileUserSnapshot(this.options.userMcpSnapshot):[];if(this.controller.signal.aborted||this.revokePromise)throw this.controller.signal.reason??new Error("MCP attachment is revoked");const r=new Set(this.options.servers.map(c=>c.logicalName)),i=t.filter(c=>r.has(c.logicalName)?!1:(r.add(c.logicalName),!0)),o=Math.max(0,u-this.options.servers.length-this.options.reservedServerCount),n=i.slice(0,o),l=Math.max(0,o-n.length),h=e.slice(0,l),m={droppedPluginServerCount:e.length-h.length,droppedUserServerCount:t.length-n.length},f=[...this.options.servers,...n,...h];for(const c of h){if(r.has(c.logicalName))throw new Error(`Duplicate MCP server name "${c.logicalName}"`);r.add(c.logicalName)}const d=this.options.executor.createView({interaction:this.options.interaction,servers:f}),{SessionMcpScope:S}=await x(),p=new S(d);this.scope=p,this.sessionId&&p.bindSessionId(this.sessionId);const g=await p.materialize();return d.serverNames().length===0?{diagnostics:m,mcpServers:[]}:{diagnostics:m,mcpServers:g.mcpServers}}catch(e){throw await this.scope?.revoke().catch(()=>{}),e}}async revokeInternal(){this.controller.abort(new Error("MCP attachment is revoked"));try{await this.scope?.revoke()}finally{this.options.onRevoked()}}requireScope(){if(!this.scope)throw new Error("MCP attachment is not materialized");return this.scope}}export class DefaultAgentMcpIntegration{static{a(this,"DefaultAgentMcpIntegration")}constructor(e){this.options=e,this.closed=!1,this.attachments=new Set,this.compiler=e.compiler??new E}createAttachment(e){if(this.closed)throw new Error("Agent MCP integration is closed");const t=this.compiler.compileAcpServers(e.setup.mcpServers,e.setup.cwd),r=a((n=[])=>{const l=new A({compiler:this.compiler,executor:this.options.executor,interaction:e.interaction,onRevoked:a(()=>this.attachments.delete(l),"onRevoked"),pluginMcpSnapshot:e.setup.pluginMcpSnapshot,userMcpSnapshot:e.setup.userMcpSnapshot,servers:[...t,...n],reservedServerCount:e.setup.reservedServerCount??0});return e.setup.clientMcp?.servers.length||this.attachments.add(l),l},"createBase"),i=e.setup.clientMcp;if(!i?.servers.length)return r();const o=new P(r,i.servers,i.owner,i.router,this.options.executor,this.compiler,e.interaction,()=>{this.attachments.delete(o)});return this.attachments.add(o),o}configureProxy(e){return this.options.executor.configureProxy(e)}async close(e){if(this.closed)return;this.closed=!0;const t=[...this.attachments];this.attachments.clear();const r=await Promise.allSettled(t.map(n=>n.revoke())),[i]=await Promise.allSettled([this.options.executor.close(e)]),o=[...r,i].filter(n=>n.status==="rejected").map(n=>n.reason);if(o.length>0)throw new AggregateError(o,"Agent MCP integration cleanup failed")}}export function createDefaultAgentMcpIntegration(s={}){const e=s.containment??new M,t=s.recordLifecycle??s.supervisor?.recordLifecycle,r=s.recordEffectTelemetry??s.supervisor?.recordEffectTelemetry,i=y.create({createSupervisor:a(o=>new C({...s.supervisor,containment:e,onElicitation:o,...t===void 0?{}:{recordLifecycle:t},...r===void 0?{}:{recordEffectTelemetry:r}}),"createSupervisor")});return new DefaultAgentMcpIntegration({...s.compiler===void 0?{}:{compiler:s.compiler},executor:i})}a(createDefaultAgentMcpIntegration,"createDefaultAgentMcpIntegration");
+var w=Object.defineProperty;var a=(i,e)=>w(i,"name",{value:e,configurable:!0});import{CodeBuddyProcessContainment as M}from"../runtime/process-containment.js";import"./agent-mcp-protocol.js";import{ClientMcpAttachment as P}from"./client-mcp-attachment.js";import{ExecutorProcessSupervisor as A}from"./executor-supervisor.js";import{ExecutorMcpIntegration as C}from"./session-mcp-view.js";import{McpSourceCompiler as y}from"./source-compiler.js";const p=128;let S;function E(){return S??=import("./session-mcp-scope.js"),S}a(E,"loadSessionMcpScope");class x{static{a(this,"DefaultAgentMcpAttachment")}constructor(e){this.options=e,this.controller=new AbortController}bindSessionId(e){if(this.sessionId&&this.sessionId!==e)throw new Error("MCP attachment is already bound to another session");this.sessionId=e,this.scope?.bindSessionId(e)}async connect(e,t){return await this.materialize(),this.requireScope().connect(e,t)}async disconnect(e,t){await this.scope?.disconnect(e,t)}async disconnectPeer(e){await this.scope?.disconnectPeer(e)}listServerStatuses(){return this.requireScope().listServerStatuses()}materialize(){return this.revokePromise?Promise.reject(new Error("MCP attachment is revoked")):(this.materialization??=this.materializeInternal(),this.materialization)}revoke(){return this.revokePromise??=this.revokeInternal(),this.revokePromise}async message(e,t){return await this.materialize(),this.requireScope().message(e,t)}notify(e,t){this.requireScope().notify(e,t)}startOAuth(e,t,r){return this.requireScope().startOAuth(e,t,r)}completeOAuth(e,t,r,s){return this.requireScope().completeOAuth(e,t,r,s)}cancelOAuth(e,t,r){return this.requireScope().cancelOAuth(e,t,r)}logoutOAuth(e,t){return this.requireScope().logoutOAuth(e,t)}callTool(e,t,r,s){return this.requireScope().callTool(e,t,r,s)}subscribeServerStatus(e){return this.requireScope().subscribeServerStatus(e)}async materializeInternal(){try{if(this.options.servers.length+this.options.reservedServerCount>p)throw new RangeError(`ACP MCP server limit exceeds ${p}`);const e=this.options.compiler.compilePluginSnapshot(this.options.pluginMcpSnapshot),t=this.options.userMcpSnapshot?this.options.compiler.compileUserSnapshot(this.options.userMcpSnapshot):[];if(this.controller.signal.aborted||this.revokePromise)throw this.controller.signal.reason??new Error("MCP attachment is revoked");const r=new Set(this.options.servers.map(c=>c.logicalName)),s=t.filter(c=>r.has(c.logicalName)?!1:(r.add(c.logicalName),!0)),o=Math.max(0,p-this.options.servers.length-this.options.reservedServerCount),n=s.slice(0,o),l=Math.max(0,o-n.length),h=e.slice(0,l),m={droppedPluginServerCount:e.length-h.length,droppedUserServerCount:t.length-n.length},v=[...this.options.servers,...n,...h];for(const c of h){if(r.has(c.logicalName))throw new Error(`Duplicate MCP server name "${c.logicalName}"`);r.add(c.logicalName)}const d=this.options.executor.createView({interaction:this.options.interaction,servers:v}),{SessionMcpScope:f}=await E(),u=new f(d);this.scope=u,this.sessionId&&u.bindSessionId(this.sessionId);const g=await u.materialize();return d.serverNames().length===0?{diagnostics:m,mcpServers:[]}:{diagnostics:m,mcpServers:g.mcpServers}}catch(e){throw await this.scope?.revoke().catch(()=>{}),e}}async revokeInternal(){this.controller.abort(new Error("MCP attachment is revoked"));try{await this.scope?.revoke()}finally{this.options.onRevoked()}}requireScope(){if(!this.scope)throw new Error("MCP attachment is not materialized");return this.scope}}export class DefaultAgentMcpIntegration{static{a(this,"DefaultAgentMcpIntegration")}constructor(e){this.options=e,this.closed=!1,this.attachments=new Set,this.compiler=e.compiler??new y}createAttachment(e){if(this.closed)throw new Error("Agent MCP integration is closed");const t=this.compiler.compileAcpServers(e.setup.mcpServers,e.setup.cwd),r=a((n=[])=>{const l=new x({compiler:this.compiler,executor:this.options.executor,interaction:e.interaction,onRevoked:a(()=>this.attachments.delete(l),"onRevoked"),pluginMcpSnapshot:e.setup.pluginMcpSnapshot,userMcpSnapshot:e.setup.userMcpSnapshot,servers:[...t,...n],reservedServerCount:e.setup.reservedServerCount??0});return e.setup.clientMcp?.servers.length||this.attachments.add(l),l},"createBase"),s=e.setup.clientMcp;if(!s?.servers.length)return r();const o=new P(r,s.servers,s.owner,s.router,this.options.executor,this.compiler,e.interaction,()=>{this.attachments.delete(o)});return this.attachments.add(o),o}configureProxy(e){return this.options.executor.configureProxy(e)}async close(e){if(this.closed)return;this.closed=!0;const t=[...this.attachments];this.attachments.clear();const r=await Promise.allSettled(t.map(n=>n.revoke())),[s]=await Promise.allSettled([this.options.executor.close(e)]),o=[...r,s].filter(n=>n.status==="rejected").map(n=>n.reason);if(o.length>0)throw new AggregateError(o,"Agent MCP integration cleanup failed")}}export function createDefaultAgentMcpIntegration(i={}){const e=i.containment??new M,t=i.recordLifecycle??i.supervisor?.recordLifecycle,r=i.recordEffectTelemetry??i.supervisor?.recordEffectTelemetry,s=C.create({createSupervisor:a(o=>new A({...i.supervisor,containment:e,onElicitation:o,...t===void 0?{}:{recordLifecycle:t},...r===void 0?{}:{recordEffectTelemetry:r}}),"createSupervisor")});return new DefaultAgentMcpIntegration({...i.compiler===void 0?{}:{compiler:i.compiler},executor:s})}a(createDefaultAgentMcpIntegration,"createDefaultAgentMcpIntegration");

package/lib/integration/client-mcp-attachment.d.ts

@@ -1,5 +1,5 @@
 import { type ConnectMcpResponse, type McpServer, type MessageMcpRequest } from '@agentclientprotocol/sdk/experimental/v2';
-import type { CompiledSessionMcpServer } from '#agent-harness-executor/types';
+import type { CompiledSessionMcpServer, ExecutorOAuthLoginInput, ExecutorOAuthLoginResult } from '#agent-harness-executor/types';
 import type { AgentHarnessHandlerContext } from '../server/types.js';
 import type { AgentMcpAttachment, AgentMcpMaterializationResult } from './agent-integration.js';
 import { type AgentMcpConnectOptions, type AgentMcpMessageOptions, type AgentMcpNotificationOptions } from './agent-mcp-protocol.js';
@@ -47,6 +47,10 @@ export declare class ClientMcpAttachment implements AgentMcpAttachment {
     }, options: AgentMcpNotificationOptions): Promise<void>;
     disconnectPeer(token: object): Promise<void>;
     listServerStatuses(): readonly SessionMcpServerStatus[];
+    startOAuth(name: string, input: ExecutorOAuthLoginInput, signal?: AbortSignal): Promise<ExecutorOAuthLoginResult>;
+    completeOAuth(name: string, state: string, code: string, signal?: AbortSignal): Promise<void>;
+    cancelOAuth(name: string, state: string, signal?: AbortSignal): Promise<void>;
+    logoutOAuth(name: string, signal?: AbortSignal): Promise<void>;
     callTool(name: string, tool: string, args: unknown, signal?: AbortSignal): ReturnType<AgentMcpAttachment['callTool']>;
     subscribeServerStatus(listener: (status: SessionMcpServerStatus) => void): () => void;
     revoke(): Promise<void>;

package/lib/integration/client-mcp-attachment.js

@@ -1 +1 @@
-var S=Object.defineProperty;var u=(w,e)=>S(w,"name",{value:e,configurable:!0});import{randomUUID as b}from"node:crypto";import{methods as m}from"@agentclientprotocol/sdk/experimental/v2";import{isRecord as p}from"../internal/guards.js";import{AgentMcpRequestError as h}from"./agent-mcp-protocol.js";import{ClientMcpSource as v}from"./client-mcp-source.js";export class ClientMcpRouter{static{u(this,"ClientMcpRouter")}constructor(){this.routes=new Map}async connect(e,n,t){const i=new AbortController,s=AbortSignal.any([e.connectionSignal,i.signal,...t.signal?[t.signal]:[]]);s.throwIfAborted();const o=await e.request(m.client.mcp.connect,{serverId:n},{signal:s});if(!p(o)||typeof o.connectionId!="string")throw new h(-32603,"Client returned an invalid MCP connectionId");const c=o.connectionId,r={id:b(),publicId:c,owner:e,peer:t,lifetime:i};if([...this.routes.values()].some(a=>a.owner.connectionSignal===e.connectionSignal&&a.publicId===c))throw new h(-32602,"Client reused an active MCP connectionId");return this.routes.set(r.id,r),s.aborted&&(await this.close(r),s.throwIfAborted()),r}message(e,n){const t=this.find(e.connectionId,n);return t.peer.peer.request({...e,connectionId:t.id},{signal:AbortSignal.any([n.signal,t.lifetime.signal])})}notify(e,n){const t=this.find(e.connectionId,n);return t.peer.peer.notify({...e,connectionId:t.id})}request(e,n,t){return e.owner.request(m.client.mcp.message,{...n,connectionId:e.publicId},{signal:AbortSignal.any([e.owner.connectionSignal,e.lifetime.signal,...t?[t]:[]])})}notification(e,n){return e.owner.notify(m.client.mcp.message,{...n,connectionId:e.publicId})}async close(e){this.routes.delete(e.id)&&(e.lifetime.abort(new Error("MCP session attachment closed")),e.owner.connectionSignal.aborted||await e.owner.request(m.client.mcp.disconnect,{connectionId:e.publicId},{timeoutMs:5e3}))}find(e,n){const t=[...this.routes.values()].find(i=>i.publicId===e&&i.owner.connectionSignal===n.connectionSignal);if(!t)throw new h(-32602,"Unknown MCP connectionId");return t}}export class ClientMcpAttachment{static{u(this,"ClientMcpAttachment")}constructor(e,n,t,i,s,o,c,r=()=>{}){this.onRevoked=r,this.sources=new Map,this.serverNames=new Map,this.connections=new Map;try{const a=n.map(l=>{const f=b(),g=o.compileClientServer(l.name,f,l._meta),I=new v(t,l.serverId,i,(d,y)=>c(d,{invocationId:b(),sessionId:this.sessionId,signal:y}));try{const d=s.registerClientSource(f,I);this.sources.set(l.name,{source:I,release:d})}catch(d){throw I.close().catch(()=>{}),d}return g});this.base=e(a)}catch(a){for(const{source:l,release:f}of this.sources.values())f(),l.close().catch(()=>{});throw this.sources.clear(),a}}bindSessionId(e){this.base.bindSessionId(e),this.sessionId=e}async materialize(){const e=await this.base.materialize();for(const n of e.mcpServers)n.type==="acp"&&typeof n.serverId=="string"&&typeof n.name=="string"&&this.sources.has(n.name)&&this.serverNames.set(n.serverId,n.name);return e}async connect(e,n){await this.materialize();const t=this.serverNames.get(e.serverId);if(t&&this.sources.get(t)?.source.closed)throw new h(-32602,"Client MCP owner is disconnected");const i=await this.base.connect(e,n),s=t?this.sources.get(t)?.source:void 0;return s&&(this.connections.set(i.connectionId,{source:s,token:n.peerToken}),s.bindPeer(n.peerToken,{request:u((o,c)=>n.peer.request({...o,connectionId:i.connectionId},c),"request"),notify:u(o=>n.peer.notify({...o,connectionId:i.connectionId}),"notify")})),i}async message(e,n){const t=this.source(e.connectionId,n.peerToken);if(!t||["initialize","tools/list","tools/call","ping"].includes(e.method)){const i=await this.base.message(e,n);if(t&&e.method==="initialize"&&p(i)){const s=t.capabilities;return{...i,capabilities:{...p(i.capabilities)?i.capabilities:{},...s?.resources?{resources:s.resources}:{},...s?.prompts?{prompts:s.prompts}:{}},...t.instructions?{instructions:t.instructions}:{}}}return i}return t.requestOther(e.method,e.params,n.signal)}notify(e,n){this.base.notify(e,n),["notifications/initialized","notifications/cancelled"].includes(e.method)||this.source(e.connectionId,n.peerToken)?.notify(e.method,e.params).catch(()=>{})}async disconnect(e,n){const t=this.source(e.connectionId,n.peerToken);await this.base.disconnect(e,n),this.connections.delete(e.connectionId),t?.unbindPeer(n.peerToken)}async disconnectPeer(e){await this.base.disconnectPeer(e);for(const[n,t]of this.connections)t.token===e&&(this.connections.delete(n),t.source.unbindPeer(e))}listServerStatuses(){return this.base.listServerStatuses()}callTool(e,n,t,i){return this.base.callTool(e,n,t,i)}subscribeServerStatus(e){return this.base.subscribeServerStatus(e)}revoke(){return this.closing??=(async()=>{const e=await Promise.allSettled([this.base.revoke()]);this.connections.clear(),e.push(...await Promise.allSettled([...this.sources.values()].map(async({source:t,release:i})=>{i(),await t.close()}))),this.sources.clear(),this.onRevoked();const n=e.flatMap(t=>t.status==="rejected"?[t.reason]:[]);if(n.length)throw new AggregateError(n,"Client MCP cleanup failed")})()}source(e,n){const t=this.connections.get(e);if(t&&t.token!==n)throw new h(-32602,"Unknown MCP connectionId");return t?.source}}
+var y=Object.defineProperty;var d=(m,e)=>y(m,"name",{value:e,configurable:!0});import{randomUUID as p}from"node:crypto";import{methods as b}from"@agentclientprotocol/sdk/experimental/v2";import{isRecord as g}from"../internal/guards.js";import{AgentMcpRequestError as h}from"./agent-mcp-protocol.js";import{ClientMcpSource as S}from"./client-mcp-source.js";export class ClientMcpRouter{static{d(this,"ClientMcpRouter")}constructor(){this.routes=new Map}async connect(e,t,n){const s=new AbortController,i=AbortSignal.any([e.connectionSignal,s.signal,...n.signal?[n.signal]:[]]);i.throwIfAborted();const o=await e.request(b.client.mcp.connect,{serverId:t},{signal:i});if(!g(o)||typeof o.connectionId!="string")throw new h(-32603,"Client returned an invalid MCP connectionId");const c=o.connectionId,r={id:p(),publicId:c,owner:e,peer:n,lifetime:s};if([...this.routes.values()].some(a=>a.owner.connectionSignal===e.connectionSignal&&a.publicId===c))throw new h(-32602,"Client reused an active MCP connectionId");return this.routes.set(r.id,r),i.aborted&&(await this.close(r),i.throwIfAborted()),r}message(e,t){const n=this.find(e.connectionId,t);return n.peer.peer.request({...e,connectionId:n.id},{signal:AbortSignal.any([t.signal,n.lifetime.signal])})}notify(e,t){const n=this.find(e.connectionId,t);return n.peer.peer.notify({...e,connectionId:n.id})}request(e,t,n){return e.owner.request(b.client.mcp.message,{...t,connectionId:e.publicId},{signal:AbortSignal.any([e.owner.connectionSignal,e.lifetime.signal,...n?[n]:[]])})}notification(e,t){return e.owner.notify(b.client.mcp.message,{...t,connectionId:e.publicId})}async close(e){this.routes.delete(e.id)&&(e.lifetime.abort(new Error("MCP session attachment closed")),e.owner.connectionSignal.aborted||await e.owner.request(b.client.mcp.disconnect,{connectionId:e.publicId},{timeoutMs:5e3}))}find(e,t){const n=[...this.routes.values()].find(s=>s.publicId===e&&s.owner.connectionSignal===t.connectionSignal);if(!n)throw new h(-32602,"Unknown MCP connectionId");return n}}export class ClientMcpAttachment{static{d(this,"ClientMcpAttachment")}constructor(e,t,n,s,i,o,c,r=()=>{}){this.onRevoked=r,this.sources=new Map,this.serverNames=new Map,this.connections=new Map;try{const a=t.map(l=>{const f=p(),I=o.compileClientServer(l.name,f,l._meta),w=new S(n,l.serverId,s,(u,v)=>c(u,{invocationId:p(),sessionId:this.sessionId,signal:v}));try{const u=i.registerClientSource(f,w);this.sources.set(l.name,{source:w,release:u})}catch(u){throw w.close().catch(()=>{}),u}return I});this.base=e(a)}catch(a){for(const{source:l,release:f}of this.sources.values())f(),l.close().catch(()=>{});throw this.sources.clear(),a}}bindSessionId(e){this.base.bindSessionId(e),this.sessionId=e}async materialize(){const e=await this.base.materialize();for(const t of e.mcpServers)t.type==="acp"&&typeof t.serverId=="string"&&typeof t.name=="string"&&this.sources.has(t.name)&&this.serverNames.set(t.serverId,t.name);return e}async connect(e,t){await this.materialize();const n=this.serverNames.get(e.serverId);if(n&&this.sources.get(n)?.source.closed)throw new h(-32602,"Client MCP owner is disconnected");const s=await this.base.connect(e,t),i=n?this.sources.get(n)?.source:void 0;return i&&(this.connections.set(s.connectionId,{source:i,token:t.peerToken}),i.bindPeer(t.peerToken,{request:d((o,c)=>t.peer.request({...o,connectionId:s.connectionId},c),"request"),notify:d(o=>t.peer.notify({...o,connectionId:s.connectionId}),"notify")})),s}async message(e,t){const n=this.source(e.connectionId,t.peerToken);if(!n||["initialize","tools/list","tools/call","ping"].includes(e.method)){const s=await this.base.message(e,t);if(n&&e.method==="initialize"&&g(s)){const i=n.capabilities;return{...s,capabilities:{...g(s.capabilities)?s.capabilities:{},...i?.resources?{resources:i.resources}:{},...i?.prompts?{prompts:i.prompts}:{}},...n.instructions?{instructions:n.instructions}:{}}}return s}return n.requestOther(e.method,e.params,t.signal)}notify(e,t){this.base.notify(e,t),["notifications/initialized","notifications/cancelled"].includes(e.method)||this.source(e.connectionId,t.peerToken)?.notify(e.method,e.params).catch(()=>{})}async disconnect(e,t){const n=this.source(e.connectionId,t.peerToken);await this.base.disconnect(e,t),this.connections.delete(e.connectionId),n?.unbindPeer(t.peerToken)}async disconnectPeer(e){await this.base.disconnectPeer(e);for(const[t,n]of this.connections)n.token===e&&(this.connections.delete(t),n.source.unbindPeer(e))}listServerStatuses(){return this.base.listServerStatuses()}startOAuth(e,t,n){return this.base.startOAuth?this.base.startOAuth(e,t,n):Promise.reject(new Error("MCP OAuth unavailable"))}completeOAuth(e,t,n,s){return this.base.completeOAuth?this.base.completeOAuth(e,t,n,s):Promise.reject(new Error("MCP OAuth unavailable"))}cancelOAuth(e,t,n){return this.base.cancelOAuth?this.base.cancelOAuth(e,t,n):Promise.reject(new Error("MCP OAuth unavailable"))}logoutOAuth(e,t){return this.base.logoutOAuth?this.base.logoutOAuth(e,t):Promise.reject(new Error("MCP OAuth unavailable"))}callTool(e,t,n,s){return this.base.callTool(e,t,n,s)}subscribeServerStatus(e){return this.base.subscribeServerStatus(e)}revoke(){return this.closing??=(async()=>{const e=await Promise.allSettled([this.base.revoke()]);this.connections.clear(),e.push(...await Promise.allSettled([...this.sources.values()].map(async({source:n,release:s})=>{s(),await n.close()}))),this.sources.clear(),this.onRevoked();const t=e.flatMap(n=>n.status==="rejected"?[n.reason]:[]);if(t.length)throw new AggregateError(t,"Client MCP cleanup failed")})()}source(e,t){const n=this.connections.get(e);if(n&&n.token!==t)throw new h(-32602,"Unknown MCP connectionId");return n?.source}}

package/lib/integration/executor-supervisor.d.ts

@@ -1,6 +1,6 @@
 import { type ChildProcess, fork, spawn } from 'node:child_process';
 import { type ExecutorPrivateProxyPolicy } from '#agent-harness-executor/private-protocol';
-import { type ExecutorElicitationRequest, type ExecutorElicitationResponse, type ExecutorMcpCallResult, type ExecutorRegistrationSnapshot, type ExecutorRegistrationSpec } from '#agent-harness-executor/types';
+import { type ExecutorElicitationRequest, type ExecutorElicitationResponse, type ExecutorMcpCallResult, type ExecutorOAuthLoginInput, type ExecutorOAuthLoginResult, type ExecutorRegistrationSnapshot, type ExecutorRegistrationSpec } from '#agent-harness-executor/types';
 import type { WindowsJob } from '#agent-harness-executor/windows-job';
 import { type HarnessEffectTelemetryLog, type HarnessEffectTelemetryMetrics, type HarnessEffectTelemetrySpan, type HarnessProcessRuntimeHandle } from '../effect-runtime/process-runtime-context.js';
 import { type NodeRuntimeLaunch } from '../runtime/node-runtime.js';
@@ -31,6 +31,10 @@ export interface ExecutorClientMcpSource {
     subscribe(listener: () => void): () => void;
 }
 export interface ExecutorRuntimeBackend {
+    startOAuth?(registrationId: string, input: ExecutorOAuthLoginInput, options?: ExecutorSupervisorRequestOptions): Promise<ExecutorOAuthLoginResult>;
+    completeOAuth?(registrationId: string, state: string, code: string, options?: ExecutorSupervisorRequestOptions): Promise<ExecutorRegistrationSnapshot>;
+    cancelOAuth?(registrationId: string, state: string, options?: ExecutorSupervisorRequestOptions): Promise<void>;
+    logoutOAuth?(registrationId: string, options?: ExecutorSupervisorRequestOptions): Promise<ExecutorRegistrationSnapshot>;
     registerClientSource?(sourceId: string, source: ExecutorClientMcpSource): () => void;
     readonly runtimeEpoch: string | undefined;
     callTool(registrationId: string, invocationId: string, executorAddress: string, args: unknown, options?: ExecutorSupervisorRequestOptions): Promise<ExecutorMcpCallResult>;
@@ -164,6 +168,11 @@ export declare class ExecutorProcessSupervisor implements ExecutorRuntimeBackend
     configureProxy(policy: ExecutorPrivateProxyPolicy): Promise<void>;
     subscribeSnapshots(listener: (registrationId: string, snapshot: ExecutorRegistrationSnapshot | undefined) => void): () => void;
     upsertRegistration(spec: ExecutorRegistrationSpec, options?: ExecutorSupervisorRequestOptions): Promise<ExecutorRegistrationSnapshot>;
+    startOAuth(registrationId: string, input: ExecutorOAuthLoginInput, options?: ExecutorSupervisorRequestOptions): Promise<ExecutorOAuthLoginResult>;
+    completeOAuth(registrationId: string, state: string, code: string, options?: ExecutorSupervisorRequestOptions): Promise<ExecutorRegistrationSnapshot>;
+    cancelOAuth(registrationId: string, state: string, options?: ExecutorSupervisorRequestOptions): Promise<void>;
+    logoutOAuth(registrationId: string, options?: ExecutorSupervisorRequestOptions): Promise<ExecutorRegistrationSnapshot>;
+    private mutateOAuth;
     refreshRegistration(registrationId: string, options?: ExecutorSupervisorRequestOptions): Promise<ExecutorRegistrationSnapshot>;
     getSnapshot(registrationId: string): ExecutorRegistrationSnapshot | undefined;
     removeRegistration(registrationId: string, options?: ExecutorSupervisorRequestOptions): Promise<void>;