@p4code/cli 0.8.3 → 0.8.4

package/dist/{binCli-DouSNynJ.mjs → binCli-Bgjc_5FL.mjs}

@@ -2,7 +2,7 @@
 
 import { $ as Uint8Array$2, $n as resolveAt, $r as isLessThan$1, $t as makeFilter, A as Null, An as omit, Ar as toString$3, At as encodeUnknownExit, B as SchemaError, Bn as make$249, Br as parseHeader, Bt as isLessThan, C as Literal, Ci as a7t, Cn as isInetAddress, Cr as Pointer, Ct as decodeUnknownResult, D as Never, Dn as assign, Dr as fromInput$2, Dt as encodeSync, En as isSchemaError, Er as empty$10, Et as encodeEffect, F as Option$3, Fn as getReferenceKey, Fr as empty$11, Ft as isBetween, G as TaggedError$1, Gn as getLastEncoding, Gr as encode$4, Gt as isNonEmpty, H as StringFromUriComponent, Hn as applyToSelfOrLastLinkEncoding, Hr as toSetCookieHeaders, Ht as isMaxLength, I as OptionFromNullOr, In as toMultiDocumentOpenApi3_1, Ir as expireCookie, It as isFinite$1, J as Trim, Jn as isNull, Jr as add$4, Jt as isSchemaError$1, K as TaggedStruct, Kn as isDeclaration, Kr as Equivalence$1, Kt as isPattern, L as Record$2, Ln as _is, Lr as fromSetCookie, Lt as isGreaterThan, M as Number$3, Mn as toJsonSchemaMultiDocument, Mr as make$246, Mt as fromJsonString, N as NumberFromString, Nn as toCodecJsonAST, Nr as value$3, Nt as instanceOf, O as NonEmptyArray, On as lambda, Or as setAll$1, Ot as encodeTo, P as Opaque, Pn as VALID_OPEN_API_COMPONENTS_SCHEMAS_KEY_REGEXP, Pr as stringOrRedacted, Pt as is$2, Q as URLFromString, Qn as isVoid, Qr as isGreaterThanOrEqualTo$2, Qt as make$247, R as RecordFromUrlParams, Rn as decodeUnknownEffect, Rr as isEmpty$3, Rt as isGreaterThanOrEqualTo$1, S as JsonObject$2, Si as map$7, Sn as inetAddressFromIpString, Sr as InvalidValue$1, St as decodeUnknownOption, T as MutableJson, Ti as y7t, Tn as unixPathAddress, Tr as appendAll$1, Tt as encode$5, U as Struct, Un as decodeTo, Ur as decode$6, Ut as isMaxProperties, V as String$7, Vn as Union$1, Vr as set$8, Vt as isLessThanOrEqualTo, W as StructWithRest, Wn as getAST, Wr as decodeString$3, Wt as isMinLength, X as Tuple, Xn as isSuspend, Xr as formatIso, Xt as isTrimmed, Y as TrueLiterals, Yn as isObjects, Yr as addDuration, Yt as isStartingWith, Z as URL$3, Zn as isUnion, Zr as isGreaterThan$1, Zt as isUUID, _ as FalseLiterals, _i as Error$6, _n as withDecodingDefault, _r as transform$4, _t as decodeOption, a as BooleanFromBit, ai as nowInCurrentZone, an as resolveAnnotationsKey, ar as composeTransformation, at as UnknownFromJsonString$2, b as Int$6, bi as taggedEnum, bn as formatUrlHostString, br as withDefault$3, bt as decodeUnknownEffect$1, c as Class$1, ci as subtract, cn as toCodecArrayFromSingle, cr as transform$3, ct as annotateKey, d as Defect, di as toEpochMillis, dn as toEncoded$1, dr as trim, dt as catchEncoding, ei as isLessThanOrEqualTo$1, en as mutable, er as resolveDescription, et as Uint8ArrayFromBase64, f as Duration, fi as toParts, fn as toEquivalence, fr as compose, ft as check, g as Exit, gi as Class$2, gn as withConstructorDefault, gr as stringifyJson, gt as decodeExit, h as Error$7, hi as EncodingError, hn as toType, hr as passthrough, ht as decodeEffect, i as Boolean$5, ii as now, in as resolveAnnotations, ir as Transformation, it as Unknown, j as NullOr, jn as toRepresentations, jr as isRedacted, jt as fieldsAssign, k as NonEmptyString$2, kn as map$8, kr as toRecord, kt as encodeUnknownEffect$1, l as DateTimeUtc, li as subtractDuration, ln as toCodecJson, lr as transformEffect$1, lt as brand, m as DurationFromString$1, mi as withCurrentZoneLocal, mn as toTaggedUnion, mr as parseJson$1, mt as decode$7, n as Any, ni as makeUnsafe$8, nn as optional$9, nr as toEncoded, nt as UndefinedOr, o as BooleanLiterals, oi as nowUnsafe, on as suspend, or as splitKeyValue, ot as Void, p as DurationFromMillis, pi as toUtc, pn as toJsonSchemaDocument, pr as forbidden, pt as declare$1, q as TemplateLiteral, qn as isLiteral, qr as Order$1, qt as isSchema, r as ArraySchema, ri as min, rn as optionalKey, rr as unknown$1, rt as Union, s as Cause, si as setParts, sn as tag$3, sr as toLowerCase, st as annotate$2, t as runClaudeHistoryWorker, ti as make$248, tn as mutableKey, tr as resolveIdentifier, tt as Undefined, u as DateTimeUtcFromString, ui as toDate, un as toCodecStringTree, ur as transformOptional, ut as catchDecoding, v as Finite, vi as TaggedClass, vn as withDecodingDefaultKey, vr as transformEffect, vt as decodeSync, w as Literals$2, wi as h7t, wn as isUnspecified, wr as defaultFormatter$1, wt as decodeUnknownSync, x as Json, xi as makeEquivalence$1, xn as formatUrlUnsafe, xr as Forbidden$1, xt as decodeUnknownExit, y as FiniteFromString, yi as TaggedError, yn as formatIp, yr as transformOptional$1, yt as decodeTo$1, z as Redacted$1, zn as encodeUnknownEffect, zr as merge$2, zt as isInt } from "./claudeHistoryWorker-v_0uyLGp.mjs";
 import { $ as forEach, $i as hasDies, $n as set$9, $r as makeUnsafe$10, $s as isFailure$1, $t as runPromise, A as currentSpan, Aa as contextWith, Ac as toArray$1, Ai as interrupt$3, Al as array, An as updateContext, Ao as has$6, Ar as effect, As as isArrayNonEmpty, At as matchEffect, B as filter$2, Ba as fiberEnterInterruptibleUnsafe, Bc as make$256, Bi as NoSuchElementError, Bl as hasProperty, Bn as withTracerEnabled, Bo as isNegative, Br as succeedContext, Bs as reduce, Bt as promise, C as catchTag, Ca as CurrentLoggers$1, Cc as liftThrowable, Ci as succeed$6, Cn as tryPromise, Co as externalSpan, Cr as currentTimeMillis, Cs as findFirst, D as context, Da as asSome$1, Dc as none$2, Di as failCause$1, Dn as undefined_, Do as random$1, Dr as build, Ds as fromIterable, Dt as match$2, E as clockWith, Ec as match, Ei as fail$2, El as equals, En as txRetry, Eo as encode$6, Er as CurrentMemoMap, Es as flatMapNullishOr, Et as mapErrorEager, F as exit$3, Fa as exitIsSuccess, Fc as flip, Fi as succeed$3, Fl as string$2, Fn as withErrorReporting, Fo as fromInputUnsafe$1, Fr as merge$4, Fs as makeBy, Ft as onInterrupt, G as findFirst$1, Gc as PipeInspectableProto, Gi as die$1, Gn as Class$4, Go as minutes$1, Gr as Scope, Gs as filterMap, Gt as race, H as filterMapOrFail, Ha as fiberInterrupt, Hi as UnknownError$3, Hn as zip, Ho as max, Hr as sync$2, Hs as sort, Ht as provideContext, I as fail$1, Ii as void_$2, Il as structure, In as withFiber, Io as hours, Ir as mergeAll, It as option$1, J as flatMapEager, Ja as forkUnsafe, Ji as filterInterruptors, Jl as isNotUndefined, Jn as empty$12, Jo as seconds, Jr as close, Js as fail, Jt as request, K as firstSuccessOf, Ki as done, Kl as isNotNull, Kn as RequestPrototype, Ko as nanos, Kr as addFinalizer, Ks as headUnsafe, Kt as raceFirst, L as failCause$2, Lc as isGreaterThanOrEqualTo$3, Li as Done, Ln as withLogSpan, Lo as infinity, Lr as provide$1, Ls as map$9, Lt as orDie, M as die, Ma as endSpan, Mi as isFailure, Ml as hash$2, Mn as void_$1, Mo as days, Mr as effectDiscard, Ms as isReadonlyArrayNonEmpty, Mt as onError, N as effectify, Na as exitHasInterrupts, Nc as Number$4, Ni as isSuccess$1, No as format$1, Nr as empty$16, Nt as onExit, O as contextWith$1, Oc as orElse$2, Oi as findErrorOption$1, On as uninterruptible, Oo as Scheduler$1, Or as buildWithMemoMap, Ot as matchCauseEffect, P as ensuring, Pi as match$3, Pl as optimize, Pn as whileLoop, Po as fromInput$3, Pr as launch$1, Pt as onExitPrimitive, Qa as loggerMake, Qi as fromReasons, Qn as remove$5, Qo as toMinutes, Qr as make$253, Qs as getOrUndefined$2, Qt as runForkWith, Ri as ExceededCapacityError, Rl as symbol$4, Rn as withParentSpan, Rr as provideMerge, Rs as match$1, Rt as orElseSucceed, S as catchReason, Sa as ConsoleRef, Sc as isSome, Si as poll, Sn as timeoutOrElse, So as Tracer, Sr as Clock, Ss as filterMap$1, St as map$11, Su as pipeArguments, T as catch_, Tc as map$12, Ti as die$2, Tl as strictEqual, Tn as tx, To as nativeTracer, Tr as monotonicTimeNanos, Ts as findLast, Tt as mapError, U as filterOrElse, Ui as annotate$3, Un as zipWith, Uo as millis, Ur as tap$2, Us as take$1, Ut as provideService, Va as fiberEnterUninterruptibleUnsafe, Vc as mapInput$1, Vi as StackTrace, Vn as yieldNow, Vo as isZero, Vr as suspend$2, Vs as reverse, Vt as provide$2, W as filterOrFail, Wa as fiberJoin, Wi as combine$2, Wn as equalBatchKeys, Wo as min$1, Wr as unwrap, Ws as empty$15, X as fn, Xc as contE, Xi as findErrorOption, Xl as isNumber$1, Xn as has$5, Xo as times, Xr as fork, Xt as retry$1, Y as flatten$1, Yc as contA, Yl as isNullish, Yn as get$15, Yo as sum, Yr as closeUnsafe, Ys as failVoid, Yt as result$1, Z as fnUntraced, Zi as findFail, Zl as isObject$3, Zn as make$252, Zo as toMillis$1, Zr as forkUnsafe$1, Zs as getOrThrow, Zt as runFork, _ as catchCauseIf, _a as pretty, _c as getOrNull, _i as isDeferred, _l as symbolRedactable, _n as tapDefect, _o as CurrentErrorReporters$1, _s as append$2, _t as logFatal, _u as memoize, a as all$5, aa as isCause, ac as succeed$2, ai as MinimumLogLevel, al as getStackTraceLimit, an as scoped, ao as reportCauseUnsafe, ar as fromStep, as as get$14, at as fromOption, au as or$1, b as catchFilter, ba as squash, bc as isNone, bi as make$255, bl as normalize$3, bn as timeout, bo as NativeSpan, br as Random$1, bs as ensure, bt as logWithLevel, c as annotateLogs, ca as isFailReason, cc as exists, ci as UnhandledLogLevel, cl as Class$3, cn as serviceOption, co as succeedNone$1, cr as jittered, cs as getOrUndefined$1, ct as ignore$2, cu as compose$1, d as asSome, dc as flatMap$2, di as done$1, dl as format, dn as succeedNone, do as sync, dr as spaced, ds as make$251, dt as interruptible, du as constUndefined, ec as isResult, ei as provide, el as exitSucceed, en as runPromiseWith, er as size$5, es as zero$1, et as forever, eu as isReadonlyObject, f as asVoid, fa as isTimeoutError, fc as flatten, fi as doneUnsafe, fn as succeedSome, fo as tracerLogger$1, fr as toStep, fs as makeUnsafe$11, ft as isEffect, fu as constVoid, g as catchCause, gc as getOrElse, gi as into, gl as redact$1, gn as tapCause, gs as allocate, gt as logError, gu as identity, h as callback, hc as fromUndefinedOr, hn as tap$1, ho as void_$3, hr as catchDone, hs as Prototype, ht as logDebug, hu as flow$2, i as addFinalizer$1, ia as interruptors, ii as CurrentStackFrame, il as withFiber$1, in as scope, io as onExitUnsafe, ir as forever$1, is as empty$14, it as forkScoped, j as delay, ja as effectIsExit, ji as isExit, jl as combine$1, jn as useSpan, jo as toPredicate, jr as effectContext, js as isCanonicalArrayIndex, jt as never, k as currentParentSpan, ka as consolePretty$1, kc as some, ki as hasInterrupts, kl as symbol$3, kn as uninterruptibleMask, ko as compose$2, kr as catch_$1, kt as matchCauseEffectEager, l as annotateLogsScoped, la as isInterruptReason, lc as filter$1, li as _await, ll as NodeInspectSymbol, ln as sleep, lo as succeedSome$1, lr as modifyDelay, ls as getOrUndefinedUnsafe, lt as ignoreCause, lu as constFalse, m as cachedInvalidateWithTTL, ma as makeFailReason, mc as fromNullishOr, mi as failCause$3, mn as sync$1, mo as updateContext$1, mr as upTo, ms as omit$1, mt as log$1, mu as dual, n as acquireRelease, na as hasInterruptsOnly, nc as map$10, ni as CurrentLogLevel, nn as runSyncExit, nr as addDelay, ns as Service$3, nt as forkDetach, nu as isTagged, o as andThen, oa as isDieReason, oc as try_$1, oi as TracerEnabled, ol as setStackTraceLimit, on as scopedWith, or as identity_, os as getOption$2, ot as fromResult, ou as backEdges, p as cached, pa as makeDieReason, pi as fail$4, pn as suspend$1, ps as merge$3, pt as isSuccess$3, pu as constant, q as flatMap$1, qa as fnUntraced$1, qi as fail$3, qn as clear$1, qr as addFinalizerExit, qs as all$6, qt as repeat, r as acquireUseRelease, ra as interrupt$2, ri as CurrentLogSpans, rn as runSyncWith, rr as exponential, rs as add$5, rt as forkIn, ru as isUndefined, s as annotateCurrentSpan, sc as contains, si as TracerTimingEnabled, sl as BaseProto, sn as service, so as succeed$5, sr as isSchedule, ss as getOrElse$1, st as gen$1, su as cast, t as Transaction, ta as hasInterrupts$1, tc as isSuccess$2, ti as CurrentLogAnnotations, tl as isEffect$1, tn as runSync, to as makeSpanUnsafe, ts as Reference, tt as forkChild, tu as isString, u as as, ua as isNoSuchElementError, uc as firstSomeOf, ui as die$3, ul as toJson, un as succeed$1, ur as passthrough$1, us as getUnsafe$2, ut as interrupt$1, uu as constTrue, v as catchDefect, va as prettyErrors, vc as getOrThrow$1, vi as isDone, vl as assignProperties, vn as tapError$1, vo as DisablePropagation, vr as isDoneCause, vt as logInfo, w as catchTags, wa as LogLevelOrder, wc as makeOrder, wi as asVoidAll, wl as make$250, wn as try_, wo as make$254, wr as currentTimeNanos, ws as findFirstIndex, wt as mapEager, x as catchIf, xa as ClockRef, xc as isOption, xi as makeUnsafe$9, xl as normalizeNonEmpty, xn as timeoutOption, xo as ParentSpan, xr as nextBetween, xs as filter, xt as makeSpanScoped, y as catchEager, ya as reasonAnnotations, yc as getOrUndefined, yi as isDoneUnsafe, yl as assignProperty, yn as tapErrorTag, yo as MinimumTraceLevel, ys as empty$13, yt as logWarning$1, yu as pipe, z as fiber, zi as IllegalArgumentError, zl as compose$3, zn as withSpan, zo as isFinite$2, zr as succeed$4, zs as of$1, zt as partition } from "./Effect-BahT0mOQ.mjs";
-import { $ as mergeAll$1, $t as mapEffect$2, A as fromArray, An as sliding$1, At as timeoutOrElse$1, B as fromReadableStream, Bn as interrupt$4, Bt as zipLatestWith, C as filter$3, Cn as take$2, Ct as suspend$3, D as flatMap$3, Dn as publishAll, Dt as takeWhile, E as filterMapEffect, En as publish, Et as takeUntilEffect, F as fromIterable$1, Fn as set$10, G as isStream, Gn as round, Gt as last, H as groupedWithin, Hn as join$1, Ht as forEach$1, I as fromIteratorSucceed, In as makeUnsafe$12, It as transduce, J as mapAccum, Jt as decodeText$2, K as make$260, Kt as mapInput$2, L as fromPubSub, Ln as awaitAll, Lt as transformPull, M as fromChannel$1, Mn as take$3, Mt as toAsyncIterableWith, N as fromEffect, Nn as unbounded$1, Nt as toPull, O as flattenIterable, On as publishUnsafe, Ot as tap$3, P as fromEffectRepeat, Pn as make$257, Pt as toReadableStreamEffect, Q as merge$5, Qt as mapDone, R as fromPull, Rn as await_, Rt as unfold, S as failCause$5, Sn as sliding, St as succeed$7, T as filterMap$2, Tn as unbounded$2, Tt as takeUntil, U as ignore$3, Un as runIn, Ut as fromChannel, V as fromSubscription, Vn as interruptAll, Vt as drain, W as interruptWhen, Wn as parse$6, Wt as isSink, X as mapEffect$3, Y as mapArrayEffect, Yt as filterArray, Z as mapError$1, Zt as fromTransform, _ as drop$2, _n as offerAll, _t as runForEachArray, a as responsePayloads, an as makeUnsafe$13, at as pipeThroughChannel, b as ensuring$1, bn as shutdown$1, bt as scoped$1, c as catchTag$1, cn as collect$1, ct as provideService$1, d as changesWith, dn as endUnsafe, dt as run$5, et as mkString, f as concat$2, fn as fail$6, ft as runCollect, g as drain$1, gn as offer$1, gt as runForEach, h as die$4, hn as make$258, ht as runFoldEffect, in as make$259, it as paginate$1, j as fromAsyncIterable, jn as subscribe, jt as toAsyncIterable, k as forever$2, kn as shutdown$2, kt as tick, l as catch_$2, ln as dropping, lt as rechunk, m as decodeText$1, mn as failCauseUnsafe, mt as runFold, nn as pipeTo, nt as onEnd, o as callback$1, on as bounded, ot as pipeThroughChannelOrFail, p as debounce, pn as failCause$4, pt as runDrain, q as map$13, qt as unwrap$2, r as runAcpMcpCliFastPath, rn as splitLines$2, rt as orDie$1, s as catchCause$1, sn as clear$2, st as provideContext$1, tt as mkUint8Array, u as changes$1, un as end, ut as repeat$1, v as empty$17, vn as offerUnsafe, vt as runHead, w as filterEffect, wn as takeAll, wt as switchMap, x as fail$5, xn as shutdownUnsafe, xt as splitLines$1, y as encodeText$1, yn as poll$1, yt as runLast, z as fromQueue, zn as getCurrent, zt as unwrap$1 } from "./AcpMcpStdioBridge-DBONIB-w.mjs";
+import { $ as mergeAll$1, $t as mapEffect$2, A as fromArray, An as sliding$1, At as timeoutOrElse$1, B as fromReadableStream, Bn as interrupt$4, Bt as zipLatestWith, C as filter$3, Cn as take$2, Ct as suspend$3, D as flatMap$3, Dn as publishAll, Dt as takeWhile, E as filterMapEffect, En as publish, Et as takeUntilEffect, F as fromIterable$1, Fn as set$10, G as isStream, Gn as round, Gt as last, H as groupedWithin, Hn as join$1, Ht as forEach$1, I as fromIteratorSucceed, In as makeUnsafe$12, It as transduce, J as mapAccum, Jt as decodeText$2, K as make$260, Kt as mapInput$2, L as fromPubSub, Ln as awaitAll, Lt as transformPull, M as fromChannel$1, Mn as take$3, Mt as toAsyncIterableWith, N as fromEffect, Nn as unbounded$1, Nt as toPull, O as flattenIterable, On as publishUnsafe, Ot as tap$3, P as fromEffectRepeat, Pn as make$257, Pt as toReadableStreamEffect, Q as merge$5, Qt as mapDone, R as fromPull, Rn as await_, Rt as unfold, S as failCause$5, Sn as sliding, St as succeed$7, T as filterMap$2, Tn as unbounded$2, Tt as takeUntil, U as ignore$3, Un as runIn, Ut as fromChannel, V as fromSubscription, Vn as interruptAll, Vt as drain, W as interruptWhen, Wn as parse$6, Wt as isSink, X as mapEffect$3, Y as mapArrayEffect, Yt as filterArray, Z as mapError$1, Zt as fromTransform, _ as drop$2, _n as offerAll, _t as runForEachArray, a as responsePayloads, an as makeUnsafe$13, at as pipeThroughChannel, b as ensuring$1, bn as shutdown$1, bt as scoped$1, c as catchTag$1, cn as collect$1, ct as provideService$1, d as changesWith, dn as endUnsafe, dt as run$5, et as mkString, f as concat$2, fn as fail$6, ft as runCollect, g as drain$1, gn as offer$1, gt as runForEach, h as die$4, hn as make$258, ht as runFoldEffect, in as make$259, it as paginate$1, j as fromAsyncIterable, jn as subscribe, jt as toAsyncIterable, k as forever$2, kn as shutdown$2, kt as tick, l as catch_$2, ln as dropping, lt as rechunk, m as decodeText$1, mn as failCauseUnsafe, mt as runFold, nn as pipeTo, nt as onEnd, o as callback$1, on as bounded, ot as pipeThroughChannelOrFail, p as debounce, pn as failCause$4, pt as runDrain, q as map$13, qt as unwrap$2, r as runAcpMcpCliFastPath, rn as splitLines$2, rt as orDie$1, s as catchCause$1, sn as clear$2, st as provideContext$1, tt as mkUint8Array, u as changes$1, un as end, ut as repeat$1, v as empty$17, vn as offerUnsafe, vt as runHead, w as filterEffect, wn as takeAll, wt as switchMap, x as fail$5, xn as shutdownUnsafe, xt as splitLines$1, y as encodeText$1, yn as poll$1, yt as runLast, z as fromQueue, zn as getCurrent, zt as unwrap$1 } from "./AcpMcpStdioBridge-DHwGLtep.mjs";
 import * as NodeModule from "node:module";
 import { createRequire } from "node:module";
 import * as NFS from "node:fs";
@@ -14902,7 +14902,7 @@ const make$228 = () => {
 const layer$242 = sync$2(NetService, make$228);
 //#endregion
 //#region package.json
-var version$2 = "0.8.3";
+var version$2 = "0.8.4";
 //#endregion
 //#region src/cli/acpMcpBridge.ts
 /**
@@ -40660,24 +40660,10 @@ const McpServerConfig = Struct({
 });
 /**
 * Whether a driver can receive a server over the transport. Codex, Claude and
-* Cursor take both transports. OpenCode shares one server across a directory's
-* threads, so it takes none. Every other driver runs over ACP, which takes
-* stdio servers without a working directory.
+* Cursor take both transports. ACP uses P4's stdio bridge for HTTP servers;
+* OpenCode receives the registry in its isolated local server.
 */
-const mcpProviderSupport = (driver, transport) => {
-	if (driver === "codex" || driver === "claudeAgent" || driver === "cursor") return { supported: true };
-	if (driver === "opencode") return {
-		supported: false,
-		reason: "provider"
-	};
-	if (transport.type === "http") return {
-		supported: false,
-		reason: "remote"
-	};
-	if (transport.cwd !== void 0) return {
-		supported: false,
-		reason: "working-directory"
-	};
+const mcpProviderSupport = (_driver, _transport) => {
 	return { supported: true };
 };
 /** A Claude Code plugin folder on the server host (`.claude-plugin/plugin.json`). */
@@ -40752,11 +40738,13 @@ const McpServerOAuthStartResult = Struct({ authorizationUrl: NullOr(String$7) })
 */
 const DiscoveredMcpServer = Struct({
 	provider: McpImportSource,
+	/** All providers with an equivalent configuration; optional for older servers. */
+	providers: optionalKey(ArraySchema(McpImportSource)),
 	path: String$7,
 	name: String$7,
 	type: Literals$2(["stdio", "http"]),
 	summary: String$7,
-	/** Already in the registry under the same name. */
+	/** An equivalent configuration is already in the registry. */
 	alreadyAdded: Boolean$5
 });
 const McpDiscoverInput = Struct({ projectId: optionalKey(ProjectId) });
@@ -41912,6 +41900,8 @@ const ProjectSettingsOverrides = Struct({
 	mcpServers: optionalKey(Record$2(McpServerId, ProjectRegistryEntryOverride)),
 	/** Per-entry `enabled` overrides of `plugins`, merged like `providerInstances`. */
 	plugins: optionalKey(Record$2(PluginId, ProjectRegistryEntryOverride)),
+	/** Native skill enablement by name, for providers with session controls. */
+	skillOverrides: optionalKey(Record$2(TrimmedNonEmptyString, Boolean$5)),
 	worktreeCleanup: optionalKey(WorktreeCleanup),
 	defaultModelSelection: optionalKey(NullOr(ModelSelection)),
 	defaultRuntimeMode: optionalKey(RuntimeMode$1),
@@ -42139,6 +42129,8 @@ const ServerSettings = Struct({
 	* environment starts. Environment and header values live in the secret store.
 	*/
 	mcpServers: Record$2(McpServerId, McpServerConfig).pipe(withDecodingDefault(succeed$1({}))),
+	/** Native skill enablement. External provider configuration files are never changed. */
+	skillOverrides: Record$2(TrimmedNonEmptyString, Boolean$5).pipe(withDecodingDefault(succeed$1({}))),
 	/** Claude Code plugin folders on this host, given to Claude sessions. */
 	plugins: Record$2(PluginId, PluginConfig).pipe(withDecodingDefault(succeed$1({}))),
 	/** Allows this server to read the Cursor CLI's macOS Keychain login for account usage. */
@@ -42367,6 +42359,7 @@ const ServerSettingsPatch = Struct({
 	usageLimitSources: optionalKey(Record$2(UsageLimitSourceId, NullOr(UsageLimitSourceConfig))),
 	mcpServers: optionalKey(Record$2(McpServerId, NullOr(McpServerConfig))),
 	plugins: optionalKey(Record$2(PluginId, NullOr(PluginConfig))),
+	skillOverrides: optionalKey(Record$2(TrimmedNonEmptyString, NullOr(Boolean$5))),
 	cursorKeychainUsageEnabled: optionalKey(Boolean$5),
 	/** Each entry replaces one model's rates; `null` restores automatic pricing. */
 	usagePriceOverrides: optionalKey(Record$2(TrimmedNonEmptyString, NullOr(UsageModelPriceOverride))),
@@ -56740,7 +56733,8 @@ function mergeProjectSettingsOverridesPatch(current, patch) {
 			...entry,
 			...keepOmittedOverride(entry, stored, "providerInstances"),
 			...keepOmittedOverride(entry, stored, "mcpServers"),
-			...keepOmittedOverride(entry, stored, "plugins")
+			...keepOmittedOverride(entry, stored, "plugins"),
+			...keepOmittedOverride(entry, stored, "skillOverrides")
 		});
 	}
 	return Object.fromEntries(next);
@@ -56798,7 +56792,7 @@ function translateLegacyProjectOverridePatch(current, patch) {
 function applyServerSettingsPatch(current, rawPatch) {
 	const patch = translateLegacyProjectOverridePatch(current, rawPatch);
 	const selectionPatch = patch.textGenerationModelSelection;
-	const { migrateModelPreferences, setModelFavorites, setModelsHidden, setProviderModelOrder, providerModelPreferences, automaticGitFetchInterval, providerHealthRefreshInterval, backgroundActivityProfile, backgroundActivity, worktreeCleanup: worktreeCleanupPatch, usageLimitSources: usageLimitSourcesPatch, mcpServers: mcpServersPatch, plugins: pluginsPatch, sourceControlHosts: sourceControlHostsPatch, usagePriceOverrides: usagePriceOverridesPatch, usageModelAliases: usageModelAliasesPatch, projectSettingsOverrides: projectSettingsOverridesPatch, projectAgentBrowserAccessOverrides: _legacyBrowserAccess, projectAutoPullOverrides: _legacyAutoPull, projectScriptOverrides: _legacyScripts, ...patchForMerge } = patch;
+	const { migrateModelPreferences, setModelFavorites, setModelsHidden, setProviderModelOrder, providerModelPreferences, automaticGitFetchInterval, providerHealthRefreshInterval, backgroundActivityProfile, backgroundActivity, worktreeCleanup: worktreeCleanupPatch, usageLimitSources: usageLimitSourcesPatch, mcpServers: mcpServersPatch, plugins: pluginsPatch, skillOverrides: skillOverridesPatch, sourceControlHosts: sourceControlHostsPatch, usagePriceOverrides: usagePriceOverridesPatch, usageModelAliases: usageModelAliasesPatch, projectSettingsOverrides: projectSettingsOverridesPatch, projectAgentBrowserAccessOverrides: _legacyBrowserAccess, projectAutoPullOverrides: _legacyAutoPull, projectScriptOverrides: _legacyScripts, ...patchForMerge } = patch;
 	const currentBackgroundActivity = normalizeServerBackgroundActivitySettings(current);
 	const backgroundActivityPatch = backgroundActivityProfile !== void 0 ? {
 		schemaVersion: 1,
@@ -56891,6 +56885,7 @@ function applyServerSettingsPatch(current, rawPatch) {
 		...patch.defaultProjectScripts !== void 0 ? { defaultProjectScripts: patch.defaultProjectScripts } : {},
 		...usageLimitSourcesPatch !== void 0 ? { usageLimitSources: mergeSettingsEntries(current.usageLimitSources, usageLimitSourcesPatch) } : {},
 		...mcpServersPatch !== void 0 ? { mcpServers: mergeSettingsEntries(current.mcpServers, mcpServersPatch) } : {},
+		...skillOverridesPatch !== void 0 ? { skillOverrides: mergeSettingsEntries(current.skillOverrides, skillOverridesPatch) } : {},
 		...pluginsPatch !== void 0 ? { plugins: mergeSettingsEntries(current.plugins, pluginsPatch) } : {},
 		...usagePriceOverridesPatch !== void 0 ? { usagePriceOverrides: mergeSettingsEntries(current.usagePriceOverrides, usagePriceOverridesPatch) } : {},
 		...usageModelAliasesPatch !== void 0 ? { usageModelAliases: mergeSettingsEntries(current.usageModelAliases, usageModelAliasesPatch) } : {},
@@ -168430,6 +168425,24 @@ function mcpToolPresentation$1(input) {
 *
 * @module provider-core/server/UserMcpServers
 */
+/** Preserve cwd for provider SDKs whose stdio configuration has no cwd field. */
+const withStdioWorkingDirectory = (transport, self) => {
+	if (transport.cwd === void 0) return transport;
+	return {
+		type: "stdio",
+		command: self.command,
+		args: selfInvocationArgs(self, ["acp-mcp-bridge"]),
+		env: {
+			...transport.env,
+			ELECTRON_RUN_AS_NODE: "1",
+			T3_ACP_MCP_STDIO: JSON.stringify({
+				command: transport.command,
+				args: transport.args,
+				cwd: transport.cwd
+			})
+		}
+	};
+};
 const EMPTY_USER_MCP_REGISTRY = {
 	servers: [],
 	plugins: []
@@ -169412,20 +169425,41 @@ function negotiatedCapabilities(base, started) {
 	};
 }
 /**
-* Registry servers an ACP agent can take. Stdio is ACP's baseline transport;
-* remote servers are left out because agents routinely drop injected http
-* servers (see below), and ACP's stdio entry has no working directory.
+* ACP's baseline is stdio. Bridge remote entries using P4's resolved headers,
+* so agents never need their own OAuth grant.
 */
-function acpUserMcpServers(servers) {
-	return servers.flatMap((server) => server.transport.type === "stdio" && server.transport.cwd === void 0 ? [{
-		name: server.name,
-		command: server.transport.command,
-		args: [...server.transport.args],
-		env: Object.entries(server.transport.env).map(([name, value]) => ({
-			name,
-			value
-		}))
-	}] : []);
+function acpUserMcpServers(servers, self) {
+	return servers.map((server) => {
+		if (server.transport.type === "http") return {
+			name: server.name,
+			command: self.command,
+			args: [...selfInvocationArgs(self, ["acp-mcp-bridge"])],
+			env: [
+				{
+					name: "ELECTRON_RUN_AS_NODE",
+					value: "1"
+				},
+				{
+					name: "T3_ACP_MCP_ENDPOINT",
+					value: server.transport.url
+				},
+				{
+					name: "T3_ACP_MCP_HEADERS",
+					value: JSON.stringify(server.transport.headers)
+				}
+			]
+		};
+		const transport = withStdioWorkingDirectory(server.transport, self);
+		return {
+			name: server.name,
+			command: transport.command,
+			args: [...transport.args],
+			env: Object.entries(transport.env).map(([name, value]) => ({
+				name,
+				value
+			}))
+		};
+	});
 }
 function acpMcpContext(session, self, userServers = []) {
 	if (session === void 0) return {
@@ -169866,7 +169900,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 	const { flavor, selfInvocation: self } = options;
 	const readUserMcpRegistry = yield* makeReader;
 	const driver = flavor.driver;
-	const readMcpContext = (threadId) => threadId === null ? succeed$1(acpMcpContext(void 0, self)) : all$5([mcpSessions.read(threadId), readUserMcpRegistry(threadId)]).pipe(map$11(([session, registry]) => acpMcpContext(session, self, acpUserMcpServers(serversForDriver(registry, driver)))));
+	const readMcpContext = (threadId) => threadId === null ? succeed$1(acpMcpContext(void 0, self)) : all$5([mcpSessions.read(threadId), readUserMcpRegistry(threadId)]).pipe(map$11(([session, registry]) => acpMcpContext(session, self, acpUserMcpServers(serversForDriver(registry, driver), self))));
 	const continuationRequests = options.continuationRequests;
 	const postSettleContinuationEnabled = flavor.enablePostSettleContinuation === true && continuationRequests !== void 0;
 	return ProviderAdapterV2.of({
@@ -170343,7 +170377,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					markdown,
 					planId
 				});
-				const now$133 = yield* now;
+				const now$134 = yield* now;
 				const nodeId = idAllocator.derive.nodeFromProviderItem({
 					driver,
 					nativeItemId
@@ -170376,7 +170410,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						runtimeRequestId: null,
 						checkpointScopeId: null,
 						startedAt: context.startedAt,
-						completedAt: now$133
+						completedAt: now$134
 					}
 				});
 				yield* emitProviderEvent({
@@ -170408,8 +170442,8 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						status: "completed",
 						title: null,
 						startedAt: context.startedAt,
-						completedAt: now$133,
-						updatedAt: now$133,
+						completedAt: now$134,
+						updatedAt: now$134,
 						type: "proposed_plan",
 						planId,
 						markdown,
@@ -170437,7 +170471,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 			const emitTextSegment = fnUntraced(function* (context, kind, completed) {
 				const segment = textStreamFor(context, kind).current;
 				if (segment === null) return;
-				const now$121 = yield* now;
+				const now$122 = yield* now;
 				const ordinal = yield* resolveItemOrdinal(context, segment.nativeItemId);
 				const nodeId = providerNodeId(segment.nativeItemId);
 				const turnItemId = providerTurnItemId(segment.nativeItemId);
@@ -170464,7 +170498,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						runtimeRequestId: null,
 						checkpointScopeId: null,
 						startedAt: segment.startedAt,
-						completedAt: completed ? now$121 : null
+						completedAt: completed ? now$122 : null
 					}
 				});
 				if (kind !== "reasoning") {
@@ -170482,7 +170516,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						attachments: [],
 						streaming: !completed,
 						createdAt: segment.startedAt,
-						updatedAt: now$121
+						updatedAt: now$122
 					};
 					yield* emitProviderEvent({
 						type: "message.updated",
@@ -170507,8 +170541,8 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 							status: completed ? "completed" : "running",
 							title: null,
 							startedAt: segment.startedAt,
-							completedAt: completed ? now$121 : null,
-							updatedAt: now$121,
+							completedAt: completed ? now$122 : null,
+							updatedAt: now$122,
 							type: "user_message",
 							messageId,
 							inputIntent: "turn_start",
@@ -170531,8 +170565,8 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 							status: completed ? "completed" : "running",
 							title: null,
 							startedAt: segment.startedAt,
-							completedAt: completed ? now$121 : null,
-							updatedAt: now$121,
+							completedAt: completed ? now$122 : null,
+							updatedAt: now$122,
 							type: "assistant_message",
 							messageId,
 							text: segment.text,
@@ -170558,8 +170592,8 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						status: completed ? "completed" : "running",
 						title: null,
 						startedAt: segment.startedAt,
-						completedAt: completed ? now$121 : null,
-						updatedAt: now$121,
+						completedAt: completed ? now$122 : null,
+						updatedAt: now$122,
 						type: "reasoning",
 						text: segment.text,
 						streaming: !completed
@@ -170588,10 +170622,10 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 				const sourceMessageId = messageId?.trim() || null;
 				if (stream.current !== null && sourceMessageId !== null && stream.current.sourceMessageId !== null && stream.current.sourceMessageId !== sourceMessageId) yield* closeTextStream(context, kind);
 				if (stream.current === null) {
-					const now$125 = yield* now;
+					const now$126 = yield* now;
 					stream.current = {
 						nativeItemId: sourceMessageId === null ? `${context.nativeTurnId}:${kind}:${stream.nextSegment}` : `${context.nativeTurnId}:${kind}:message:${sourceMessageId}`,
-						startedAt: now$125,
+						startedAt: now$126,
 						sourceMessageId,
 						text: ""
 					};
@@ -170609,10 +170643,10 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 				const stream = textStreamFor(context, kind);
 				if (stream.current?.sourceMessageId !== messageId) {
 					yield* closeTextStream(context, kind);
-					const now$123 = yield* now;
+					const now$124 = yield* now;
 					stream.current = {
 						nativeItemId: `${context.nativeTurnId}:${kind}:message:${messageId}`,
-						startedAt: now$123,
+						startedAt: now$124,
 						sourceMessageId: messageId,
 						text
 					};
@@ -170627,7 +170661,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 				const messageText = mode === "replace" ? text : `${previous}${text}`;
 				subagent.assistantMessages.set(nativeItemId, messageText);
 				subagent.assistantText = messageText;
-				const now$122 = yield* now;
+				const now$123 = yield* now;
 				const ordinal = resolveSubagentChildOrdinal(subagent, nativeItemId);
 				const artifacts = makeSubagentConversationArtifacts({
 					messageId: providerMessageId(nativeItemId),
@@ -170644,7 +170678,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					role: "assistant",
 					text: subagent.assistantText,
 					ordinal,
-					now: now$122
+					now: now$123
 				});
 				yield* emitProviderEvent({
 					type: "message.updated",
@@ -170679,7 +170713,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 				if (existing === void 0) {
 					if (update.prompt === "" && update.title === null || update.suppressNormalTool === false) return;
 				}
-				const now$126 = yield* now;
+				const now$127 = yield* now;
 				const nativeTaskId = existing?.task.nativeTaskRef?.nativeId ?? update.nativeTaskId;
 				const nativeItemRef = {
 					driver,
@@ -170712,13 +170746,13 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						prompt: update.prompt,
 						title: update.title,
 						result: null,
-						startedAt: now$126
+						startedAt: now$127
 					},
 					model: update.model?.trim() || existing?.task.model || null,
 					status: taskStatus,
 					result: update.result ?? existing?.task.result ?? null,
-					completedAt: acpSubagentStatusIsTerminal(taskStatus) ? now$126 : null,
-					updatedAt: now$126
+					completedAt: acpSubagentStatusIsTerminal(taskStatus) ? now$127 : null,
+					updatedAt: now$127
 				};
 				const subagent = existing ?? {
 					task,
@@ -170757,7 +170791,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 								prompt: update.prompt,
 								ordinal: context.subagents.size
 							}),
-							now: now$126,
+							now: now$127,
 							createdBy: "agent",
 							creationSource: "provider"
 						})
@@ -170779,7 +170813,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						role: "user",
 						text: update.prompt,
 						ordinal: 100,
-						now: now$126
+						now: now$127
 					});
 					yield* emitProviderEvent({
 						type: "message.updated",
@@ -170808,7 +170842,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 							providerThreadId: context.input.providerThread.id,
 							providerTurnId: context.providerTurnId
 						},
-						now: now$126
+						now: now$127
 					});
 					subagent.task = {
 						...subagent.task,
@@ -170836,8 +170870,8 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					...subagent.task,
 					status: taskStatus,
 					result,
-					completedAt: acpSubagentStatusIsTerminal(taskStatus) ? now$126 : null,
-					updatedAt: now$126
+					completedAt: acpSubagentStatusIsTerminal(taskStatus) ? now$127 : null,
+					updatedAt: now$127
 				};
 				const providerThreadId = subagent.task.providerThreadId;
 				yield* emitProviderEvent({
@@ -170904,7 +170938,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						title: subagent.task.title,
 						startedAt: subagent.task.startedAt,
 						completedAt: subagent.task.completedAt,
-						updatedAt: now$126,
+						updatedAt: now$127,
 						type: "subagent",
 						subagentId: subagent.task.id,
 						origin: "provider_native",
@@ -171065,7 +171099,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					return;
 				}
 				const status = projectedStatus ?? toolStatus$1(toolCall.status);
-				const now$132 = yield* now;
+				const now$133 = yield* now;
 				const nativeItemId = `${context.nativeThreadId}:tool:${toolCall.toolCallId}`;
 				const ordinal = yield* resolveItemOrdinal(context, nativeItemId);
 				const nodeId = providerNodeId(nativeItemId);
@@ -171075,9 +171109,9 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					nativeId: toolCall.toolCallId,
 					strength: "strong"
 				};
-				const startedAt = context.toolStartedAt.get(toolCall.toolCallId) ?? now$132;
+				const startedAt = context.toolStartedAt.get(toolCall.toolCallId) ?? now$133;
 				context.toolStartedAt.set(toolCall.toolCallId, startedAt);
-				const completedAt = completedAtForStatus(status, now$132);
+				const completedAt = completedAtForStatus(status, now$133);
 				const title = toolCall.title ?? null;
 				yield* emitProviderEvent({
 					type: "node.updated",
@@ -171114,7 +171148,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					title,
 					startedAt,
 					completedAt,
-					updatedAt: now$132
+					updatedAt: now$133
 				};
 				const rawInput = toolCall.data.rawInput;
 				const rawOutput = toolCall.data.rawOutput ?? toolCall.data.content;
@@ -171286,7 +171320,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 				if (update.kind === "removed" && existing === void 0) return;
 				const nativeItemId = `${context.nativeTurnId}:plan:${encodeURIComponent(update.nativePlanId)}`;
 				const ordinal = yield* resolveItemOrdinal(context, nativeItemId);
-				const now$131 = yield* now;
+				const now$132 = yield* now;
 				const nodeId = providerNodeId(nativeItemId);
 				const turnItemId = providerTurnItemId(nativeItemId);
 				const planState = existing ?? {
@@ -171295,7 +171329,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						runId: context.input.runId,
 						driver
 					}),
-					startedAt: now$131,
+					startedAt: now$132,
 					latest: null
 				};
 				const planId = planState.id;
@@ -171362,7 +171396,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						runtimeRequestId: null,
 						checkpointScopeId: null,
 						startedAt: planState.startedAt,
-						completedAt: completed ? now$131 : null
+						completedAt: completed ? now$132 : null
 					}
 				});
 				yield* emitProviderEvent({
@@ -171386,8 +171420,8 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						status: completed ? "completed" : "running",
 						title: null,
 						startedAt: planState.startedAt,
-						completedAt: completed ? now$131 : null,
-						updatedAt: now$131,
+						completedAt: completed ? now$132 : null,
+						updatedAt: now$132,
 						...plan.kind === "todo_list" ? {
 							type: "todo_list",
 							planId,
@@ -171404,7 +171438,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 			});
 			const appendLoadedHistory = (notification, role, text, replace = false) => gen$1(function* () {
 				if (text.length === 0 && !replace) return;
-				const now$128 = yield* now;
+				const now$129 = yield* now;
 				yield* update$4(snapshot, (current) => {
 					const update = notification.update;
 					const sourceMessageId = (update.sessionUpdate === "user_message_chunk" || update.sessionUpdate === "agent_message_chunk" || update.sessionUpdate === "agent_thought_chunk" || update.sessionUpdate === "user_message" || update.sessionUpdate === "agent_message" || update.sessionUpdate === "agent_thought") && update.messageId ? update.messageId : null;
@@ -171426,8 +171460,8 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						text: replace ? text : `${previous?.text ?? ""}${text}`,
 						attachments: [],
 						streaming: false,
-						createdAt: previous?.createdAt ?? now$128,
-						updatedAt: now$128
+						createdAt: previous?.createdAt ?? now$129,
+						updatedAt: now$129
 					});
 					return {
 						order: current.order.includes(key) ? current.order : [...current.order, key],
@@ -171653,12 +171687,12 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					}
 					const knownProviderThread = (yield* get$7(providerThreadByNativeSessionId)).get(notification.sessionId);
 					if (knownProviderThread !== void 0) {
-						const now$124 = yield* now;
+						const now$125 = yield* now;
 						const providerThread = {
 							...knownProviderThread,
 							contextUsage: (yield* get$7(contextUsageBySessionId)).get(notification.sessionId) ?? knownProviderThread.contextUsage ?? null,
 							nativeMetadata: (yield* get$7(nativeMetadataBySessionId)).get(notification.sessionId) ?? knownProviderThread.nativeMetadata ?? null,
-							updatedAt: now$124
+							updatedAt: now$125
 						};
 						yield* update$4(providerThreadByNativeSessionId, (current) => new Map(current).set(notification.sessionId, providerThread));
 						yield* emitProviderEvent({
@@ -171756,9 +171790,9 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 							context.tools.set(key, merged);
 							if (!shouldPersistToolUpdate(context, key, previous, merged, merged.status)) continue;
 							const mcpIdentity = extractMcpToolCallIdentity(merged, { embeddedTerminalCommands: [...embeddedTerminalCommands(notification.sessionId, toolCall.toolCallId), ...rootSessionId === null ? [] : embeddedTerminalCommands(rootSessionId, toolCall.toolCallId)] });
-							const now$134 = yield* now;
+							const now$135 = yield* now;
 							const status = toolStatus$1(merged.status);
-							const startedAt = context.toolStartedAt.get(key) ?? now$134;
+							const startedAt = context.toolStartedAt.get(key) ?? now$135;
 							context.toolStartedAt.set(key, startedAt);
 							const ordinal = resolveSubagentChildOrdinal(subagent, key);
 							yield* emitProviderEvent({
@@ -171781,8 +171815,8 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 									status,
 									title: merged.title ?? merged.kind ?? "Tool",
 									startedAt,
-									completedAt: completedAtForStatus(status, now$134),
-									updatedAt: now$134,
+									completedAt: completedAtForStatus(status, now$135),
+									updatedAt: now$135,
 									type: "dynamic_tool",
 									...mcpIdentity === void 0 ? {} : mcpToolPresentation$1({
 										serverName: mcpIdentity.server,
@@ -171973,7 +172007,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 				const decision = yield* make$255();
 				const nativeResponseAcknowledgement = yield* make$255();
 				yield* registerNativeResponseAcknowledgement(generation, transportRequestId, nativeResponseAcknowledgement);
-				const now$120 = yield* now;
+				const now$121 = yield* now;
 				const nodeId = idAllocator.derive.approvalNode({ requestId });
 				const requestKind = providerRequestKind(parsed.kind);
 				const nativeItemRef = {
@@ -171993,7 +172027,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						type: "live",
 						providerSessionId: input.providerSessionId
 					},
-					createdAt: now$120,
+					createdAt: now$121,
 					resolvedAt: null
 				};
 				const node = {
@@ -172010,7 +172044,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					nativeItemRef,
 					runtimeRequestId: requestId,
 					checkpointScopeId: null,
-					startedAt: now$120,
+					startedAt: now$121,
 					completedAt: null
 				};
 				const turnItem = {
@@ -172025,9 +172059,9 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					ordinal,
 					status: "waiting",
 					title: null,
-					startedAt: now$120,
+					startedAt: now$121,
 					completedAt: null,
-					updatedAt: now$120,
+					updatedAt: now$121,
 					type: "approval_request",
 					requestId,
 					requestKind,
@@ -172084,7 +172118,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 				const answers = yield* make$255();
 				const nativeResponseAcknowledgement = yield* make$255();
 				yield* registerNativeResponseAcknowledgement(generation, transportRequestId, nativeResponseAcknowledgement);
-				const now$137 = yield* now;
+				const now$117 = yield* now;
 				const nodeId = providerNodeId(request.nativeItemId);
 				const turnItemId = providerTurnItemId(request.nativeItemId);
 				const nativeItemRef = {
@@ -172108,7 +172142,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						type: "live",
 						providerSessionId: input.providerSessionId
 					},
-					createdAt: now$137,
+					createdAt: now$117,
 					resolvedAt: null
 				};
 				const node = {
@@ -172125,7 +172159,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					nativeItemRef,
 					runtimeRequestId: requestId,
 					checkpointScopeId: null,
-					startedAt: now$137,
+					startedAt: now$117,
 					completedAt: null
 				};
 				const turnItem = {
@@ -172140,9 +172174,9 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					ordinal,
 					status: "waiting",
 					title: null,
-					startedAt: now$137,
+					startedAt: now$117,
 					completedAt: null,
-					updatedAt: now$137,
+					updatedAt: now$117,
 					type: "user_input_request",
 					requestId,
 					questions: [...request.questions]
@@ -172206,7 +172240,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 			const cancelPendingRuntimeRequests = fnUntraced(function* () {
 				const requests = yield* modify$3(pendingRuntimeRequests, (current) => [[...current.values()], /* @__PURE__ */ new Map()]);
 				if (requests.length === 0) return;
-				const now$127 = yield* now;
+				const now$128 = yield* now;
 				yield* forEach(requests, (request) => gen$1(function* () {
 					if (!(yield* request.type === "approval" ? succeed$6(request.decision, "cancel") : succeed$6(request.answers, null))) return;
 					yield* emitProviderEvent({
@@ -172216,7 +172250,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						runtimeRequest: {
 							...request.runtimeRequest,
 							status: "cancelled",
-							resolvedAt: now$127
+							resolvedAt: now$128
 						}
 					});
 					yield* emitProviderEvent({
@@ -172225,7 +172259,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						node: {
 							...request.node,
 							status: "cancelled",
-							completedAt: now$127
+							completedAt: now$128
 						}
 					});
 					yield* emitProviderEvent({
@@ -172234,8 +172268,8 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						turnItem: {
 							...request.turnItem,
 							status: "cancelled",
-							completedAt: now$127,
-							updatedAt: now$127
+							completedAt: now$128,
+							updatedAt: now$128
 						}
 					});
 				}), {
@@ -172249,15 +172283,15 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 			* longer guaranteed to ingest the terminal event.
 			*/
 			const mutateCarryoverSubagentStatus = fnUntraced(function* (subagent, status, resultOverride) {
-				const now$130 = yield* now;
+				const now$131 = yield* now;
 				const result = resultOverride !== void 0 && resultOverride !== null && resultOverride.length > 0 ? resultOverride : subagent.task.result ?? (subagent.assistantText || null);
-				const completedAt = acpSubagentStatusIsTerminal(status) ? now$130 : null;
+				const completedAt = acpSubagentStatusIsTerminal(status) ? now$131 : null;
 				subagent.task = {
 					...subagent.task,
 					status,
 					result,
 					completedAt,
-					updatedAt: now$130
+					updatedAt: now$131
 				};
 			});
 			/**
@@ -173037,7 +173071,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 				else if (settledStatus === "interrupted") yield* terminalizeOpenRunOwnedItems(context, { terminalizeSubagents: directStopQuarantine });
 				yield* closeTextStreams(context);
 				if (settledStatus !== "failed") yield* emitProviderRetry(context, settledStatus);
-				const now$117 = yield* now;
+				const now$118 = yield* now;
 				if (flavor.supportsCompaction === true && context.input.message.text.trim() === "/compact" && context.input.message.attachments.length === 0 && settledStatus === "completed") {
 					const nativeItemId = `${context.nativeTurnId}:compaction`;
 					yield* emitProviderEvent({
@@ -173065,12 +173099,12 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 							status: "completed",
 							title: "Context compacted",
 							startedAt: context.startedAt,
-							completedAt: now$117,
-							updatedAt: now$117
+							completedAt: now$118,
+							updatedAt: now$118
 						}
 					});
 				}
-				const turn = providerTurnPayload(context, settledStatus, now$117);
+				const turn = providerTurnPayload(context, settledStatus, now$118);
 				yield* update$4(providerTurns, (current) => {
 					const updated = new Map(current);
 					updated.set(String(turn.id), turn);
@@ -173090,7 +173124,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					firstRunOrdinal: context.input.providerThread.firstRunOrdinal ?? context.input.runOrdinal,
 					contextUsage: context.contextUsage,
 					nativeMetadata: context.nativeMetadata,
-					updatedAt: now$117
+					updatedAt: now$118
 				};
 				yield* update$4(providerThreadByNativeSessionId, (current) => new Map(current).set(context.nativeThreadId, updatedProviderThread));
 				yield* emitProviderEvent({
@@ -173503,7 +173537,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 					return false;
 				}) } : {},
 				ensureThread: fn("AcpAdapterV2.ensureThread")(function* (threadInput) {
-					const now$118 = yield* now;
+					const now$119 = yield* now;
 					const sessionId = yield* get$7(activeSessionId);
 					if (sessionId === null) return yield* new ProviderAdapterProtocolError({
 						driver,
@@ -173517,7 +173551,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						providerSessionId: input.providerSessionId,
 						nativeThreadId: sessionId,
 						...itemIdentityVersion === void 0 ? {} : { itemIdentityVersion },
-						now: now$118
+						now: now$119
 					});
 					yield* update$4(providerThreadByNativeSessionId, (current) => new Map(current).set(sessionId, providerThread));
 					return providerThread;
@@ -173553,12 +173587,12 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 							yield* set$5(activeSelection, nextSelection);
 							yield* set$5(activeInteractionMode, nextRuntimePolicy.interactionMode);
 						}
-						const now$135 = yield* now;
+						const now$136 = yield* now;
 						return {
 							...threadInput.providerThread,
 							providerSessionId: input.providerSessionId,
 							status: "idle",
-							updatedAt: now$135
+							updatedAt: now$136
 						};
 					}));
 				}, (effect, threadInput) => effect.pipe(mapError((cause) => new ProviderAdapterResumeThreadError({
@@ -173791,13 +173825,13 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 							yield* set$5(activeInteractionMode, null);
 						}
 						const state = yield* get$7(snapshot);
-						const now$129 = yield* now;
+						const now$130 = yield* now;
 						return {
 							providerThread: {
 								...snapshotInput.providerThread,
 								providerSessionId: input.providerSessionId,
 								status: "idle",
-								updatedAt: now$129
+								updatedAt: now$130
 							},
 							providerTurns: [...(yield* get$7(providerTurns)).values()],
 							messages: state.order.flatMap((key) => {
@@ -173856,7 +173890,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 							yield* set$5(lastTurnRoute, null);
 						}));
 					})).pipe(retry$1({ times: 1 }));
-					const now$136 = yield* now;
+					const now$137 = yield* now;
 					return {
 						providerThread: {
 							...rollbackInput.providerThread,
@@ -173871,7 +173905,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 								itemIdentityVersion: 2
 							},
 							status: "idle",
-							updatedAt: now$136
+							updatedAt: now$137
 						},
 						providerTurns: [],
 						messages: [],
@@ -173906,7 +173940,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 						yield* set$5(activeSelection, null);
 						yield* set$5(activeInteractionMode, null);
 						itemIdentityVersion = 2;
-						const now$119 = yield* now;
+						const now$120 = yield* now;
 						const providerThread = makeProviderThread$3({
 							driver,
 							providerInstanceId: options.instanceId,
@@ -173920,7 +173954,7 @@ const makeAcpAdapterV2 = fn("makeAcpAdapterV2")(function* (options) {
 								providerThreadId: forkInput.sourceProviderThread.id,
 								...forkInput.providerTurnId === void 0 ? {} : { providerTurnId: forkInput.providerTurnId }
 							},
-							now: now$119
+							now: now$120
 						});
 						yield* update$4(providerThreadByNativeSessionId, (current) => new Map(current).set(forked.sessionId, providerThread));
 						return providerThread;
@@ -191547,6 +191581,7 @@ function claudeUserMcpServers(servers) {
 }
 function claudeMcpQueryOverrides(input) {
 	const session = input.mcpSession;
+	const skillSettings = input.userRegistry?.skillOverrides === void 0 ? {} : { sdkSettings: { skillOverrides: Object.fromEntries(Object.entries(input.userRegistry.skillOverrides).map(([name, enabled]) => [name, enabled ? "on" : "off"])) } };
 	const userServers = claudeUserMcpServers(input.userRegistry === void 0 ? [] : serversForDriver(input.userRegistry, CLAUDE_PROVIDER));
 	const plugins = input.userRegistry === void 0 || input.userRegistry.plugins.length === 0 ? {} : { plugins: input.userRegistry.plugins.map((plugin) => ({
 		type: "local",
@@ -191555,7 +191590,8 @@ function claudeMcpQueryOverrides(input) {
 	if (session === void 0) return {
 		...input.allowedTools === void 0 ? {} : { allowedTools: input.allowedTools },
 		...Object.keys(userServers).length === 0 ? {} : { mcpServers: userServers },
-		...plugins
+		...plugins,
+		...skillSettings
 	};
 	const mcpAllowedTools = input.readOnlySandbox ? CLAUDE_READ_ONLY_T3_MCP_ALLOWED_TOOLS : [CLAUDE_T3_MCP_TOOL_WILDCARD];
 	return {
@@ -191569,7 +191605,8 @@ function claudeMcpQueryOverrides(input) {
 				timeout: CLAUDE_T3_MCP_TOOL_TIMEOUT_MS
 			}
 		},
-		...plugins
+		...plugins,
+		...skillSettings
 	};
 }
 function providerSession$2(input) {
@@ -191926,6 +191963,7 @@ function claudeRuntimeQueryPolicyKey(policy) {
 function claudeEffectiveQueryPolicyKey(queryPolicy, mcpOverrides) {
 	return JSON.stringify({
 		plugins: mcpOverrides.plugins,
+		skillSettings: mcpOverrides.sdkSettings,
 		runtimePolicy: claudeRuntimeQueryPolicyKey({
 			...queryPolicy,
 			...mcpOverrides.allowedTools === void 0 ? {} : { allowedTools: mcpOverrides.allowedTools }
@@ -192801,7 +192839,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 	const { attachmentsDir, fileSystem, path, crypto, idAllocator, queryRunner } = adapterOptions;
 	const subagentModelCatalog = scopeClaudeModelCatalog(BUNDLED_CLAUDE_MODEL_CATALOG, adapterOptions.settings.customModels);
 	const continuationRequests = adapterOptions.continuationRequests ?? { offer: () => void_$1 };
-	const userInvocableSkillNames = (cwd) => discoverClaudeSkills(adapterOptions.settings, cwd ?? void 0, adapterOptions.environment).pipe(map$11((skills) => new Set(skills.filter((skill) => skill.enabled && skill.userInvocable !== false).map((skill) => skill.name))), provideService(FileSystem, fileSystem), provideService(Path$2, path));
+	const userInvocableSkillNames = (cwd, threadId) => discoverClaudeSkills(adapterOptions.settings, cwd ?? void 0, adapterOptions.environment).pipe(flatMap$1((skills) => readUserMcpRegistry(threadId).pipe(map$11((registry) => new Set(skills.filter((skill) => (registry.skillOverrides?.[skill.name] ?? skill.enabled) && skill.userInvocable !== false).map((skill) => skill.name))))), provideService(FileSystem, fileSystem), provideService(Path$2, path));
 	return ProviderAdapterV2.of({
 		instanceId: adapterOptions.instanceId,
 		driver: CLAUDE_PROVIDER,
@@ -193050,14 +193088,14 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 			const clearOpaqueBackgroundTaskReplayTombstone = (nativeThreadId, taskId) => clearTaskIdFromNativeThreadSet(opaqueBackgroundTaskReplayTombstonesByNativeThread, nativeThreadId, taskId);
 			const emitProviderThreadRoster = fnUntraced(function* (input) {
 				const roster = rosterForNativeThread(yield* get$7(pendingBackgroundTasksByNativeThread), input.nativeThreadId);
-				const now$109 = yield* now;
+				const now$104 = yield* now;
 				const providerThread = {
 					...input.providerThread,
 					providerSessionId: session.id,
 					...input.status === void 0 ? {} : { status: input.status },
 					pendingBackgroundTasks: claudePendingBackgroundTasksFromRoster(roster),
 					...goalsByNativeThread.has(input.nativeThreadId) ? { goal: goalsByNativeThread.get(input.nativeThreadId) ?? null } : {},
-					updatedAt: now$109
+					updatedAt: now$104
 				};
 				yield* rememberProviderThread(providerThread);
 				yield* emitProviderEvent({
@@ -193335,7 +193373,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 				}).pipe(catch_(() => logWarning$1("orchestration-v2.claude-subagent-launch-lookup-failed", { taskId: resume.taskId }).pipe(as(null))));
 				if (launchToolUseId === null || launchToolUseId === resume.toolUseId) return;
 				const ids = claudeSubagentIds(resume.context, resume.taskId);
-				const now$113 = yield* now;
+				const now$108 = yield* now;
 				const subagent = {
 					confirmedOutcome: void 0,
 					childThread: null,
@@ -193360,9 +193398,9 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 						model: null,
 						result: null,
 						status: "completed",
-						startedAt: now$113,
-						completedAt: now$113,
-						updatedAt: now$113
+						startedAt: now$108,
+						completedAt: now$108,
+						updatedAt: now$108
 					},
 					rootNodeId: resume.context.input.rootNodeId,
 					childThreadId: ids.childThreadId,
@@ -193447,7 +193485,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 				const parentThread = input.coordinator.childThread;
 				const taskId = input.coordinator.task.nativeTaskRef?.nativeId;
 				if (parentThread === null || taskId === void 0 || taskId === null) return;
-				const now$107 = yield* now;
+				const now$102 = yield* now;
 				const seen = yield* get$7(workflowMemberStates);
 				const transcriptDir = input.workflow.runHandles?.transcriptDir;
 				for (const member of input.workflow.agents) {
@@ -193460,9 +193498,9 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					const model = member.model ?? parentThread.modelSelection.model;
 					const attempt = member.attempt ?? previous?.attempt ?? 1;
 					const restarted = previous !== void 0 && attempt > previous.attempt;
-					const createdAt = previous?.createdAt ?? now$107;
-					const startedAt = status === "pending" ? null : member.startedAt !== void 0 ? makeUnsafe$8(member.startedAt) : (restarted ? null : previous?.startedAt) ?? (status === "running" ? now$107 : null);
-					const completedAt = settled ? (restarted ? null : previous?.completedAt) ?? now$107 : null;
+					const createdAt = previous?.createdAt ?? now$102;
+					const startedAt = status === "pending" ? null : member.startedAt !== void 0 ? makeUnsafe$8(member.startedAt) : (restarted ? null : previous?.startedAt) ?? (status === "running" ? now$102 : null);
+					const completedAt = settled ? (restarted ? null : previous?.completedAt) ?? now$102 : null;
 					const changed = restarted || previous?.status !== status || !equals(previous?.startedAt, startedAt) || previous?.result !== member.result || previous?.label !== member.label || previous?.prompt !== prompt || previous?.model !== model;
 					const agentId = member.agentId;
 					const readTranscript = settled && transcriptDir !== void 0 && agentId !== void 0 && (input.coordinator.task.status === "running" ? (restarted ? 0 : previous?.transcriptReadAttempts ?? 0) < 3 : restarted || previous?.finalTranscriptRead !== true);
@@ -193503,7 +193541,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 						role: "user",
 						text: prompt,
 						ordinal: 100,
-						now: now$107
+						now: now$102
 					});
 					if (restarted && !settled) yield* emitSubagentConversationMessage({
 						nativeItemId: `${memberKey}:answer:200`,
@@ -193512,7 +193550,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 						role: "assistant",
 						text: "Retry in progress.",
 						ordinal: 200,
-						now: now$107
+						now: now$102
 					});
 					const task = {
 						id: nodeId,
@@ -193537,7 +193575,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 						result: member.result ?? null,
 						startedAt,
 						completedAt,
-						updatedAt: now$107
+						updatedAt: now$102
 					};
 					const nodeBase = {
 						runId: null,
@@ -193598,7 +193636,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 							role: "assistant",
 							text: answer,
 							ordinal: 200,
-							now: now$107
+							now: now$102
 						});
 					}
 					yield* update$4(workflowMemberStates, (current) => new Map(current).set(memberKey, {
@@ -193644,7 +193682,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 				if (existingSubagent !== void 0 && existingSubagent.task.status !== "running" && input.status === "running" && !isReopen) return;
 				const resumeToolUseId = input.reopen === true && existingSubagent !== void 0 && input.toolUseId !== void 0 && input.toolUseId !== existingSubagent.runToolUseId && input.prompt !== void 0 ? input.toolUseId : null;
 				const lifecycleChanged = existingSubagent === void 0 || existingSubagent.task.status !== input.status || input.reopen === true && input.status === "running";
-				const now$108 = yield* now;
+				const now$103 = yield* now;
 				const nativeItemId = `task:${input.taskId}`;
 				const derivedIds = claudeSubagentIds(input.context, input.taskId);
 				const nodeId = existingSubagent?.task.id ?? derivedIds.nodeId;
@@ -193686,7 +193724,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 						title: input.title ?? null,
 						model: input.model ?? null,
 						result: null,
-						startedAt: now$108
+						startedAt: now$103
 					},
 					status: input.status,
 					...input.reopen === true && input.status === "running" && existingSubagent !== void 0 ? { runId: input.context.input.runId } : {},
@@ -193697,9 +193735,9 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					...input.progress === void 0 ? {} : { progress: input.progress },
 					...workflowWithThreads === void 0 ? {} : { workflow: workflowWithThreads },
 					...input.result === void 0 ? {} : { result: input.result },
-					...isReopen ? { startedAt: now$108 } : {},
-					completedAt: input.status === "running" ? null : priorTask?.completedAt ?? now$108,
-					updatedAt: now$108
+					...isReopen ? { startedAt: now$103 } : {},
+					completedAt: input.status === "running" ? null : priorTask?.completedAt ?? now$103,
+					updatedAt: now$103
 				};
 				const subagent = {
 					task,
@@ -193753,7 +193791,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 							title: workflowWithThreads === void 0 ? task.title : `Workflow · ${workflowWithThreads.name ?? task.title ?? "Untitled"}`,
 							ordinal: input.context.subagentsByTaskId.size
 						}),
-						now: now$108,
+						now: now$103,
 						createdBy: "agent",
 						creationSource: "provider"
 					});
@@ -193821,7 +193859,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					role: "user",
 					text: task.prompt,
 					ordinal: existingSubagent === void 0 ? 100 : ++subagent.nextChildItemOrdinal,
-					now: now$108
+					now: now$103
 				});
 				yield* emitProviderEvent({
 					type: "subagent.updated",
@@ -193880,7 +193918,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 						role: "assistant",
 						text: input.result,
 						ordinal: resultItemOrdinal,
-						now: now$108
+						now: now$103
 					});
 				}
 			});
@@ -194186,7 +194224,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					const block = context.reasoning.blocks.get(update.itemId);
 					if (block === void 0 || update.text.length === 0) return;
 					block.text = update.text;
-					const now$114 = yield* now;
+					const now$109 = yield* now;
 					yield* emitProviderEvent({
 						type: "turn_item.updated",
 						driver: CLAUDE_PROVIDER,
@@ -194213,8 +194251,8 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 							streaming: !update.completed,
 							status: update.completed ? "completed" : "running",
 							startedAt: block.startedAt,
-							completedAt: update.completed ? now$114 : null,
-							updatedAt: now$114
+							completedAt: update.completed ? now$109 : null,
+							updatedAt: now$109
 						}
 					});
 				})
@@ -194419,7 +194457,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 			const emitAssistantTextArtifacts = fnUntraced(function* (input) {
 				if (input.context.assistant.emittedNativeItemIds.has(input.nativeItemId)) return;
 				input.context.assistant.emittedNativeItemIds.add(input.nativeItemId);
-				const now$111 = yield* now;
+				const now$107 = yield* now;
 				const ordinal = yield* resolveItemOrdinal(input.context, input.nativeItemId);
 				const artifacts = buildAssistantArtifacts({
 					idAllocator,
@@ -194428,8 +194466,8 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					nativeItemId: input.nativeItemId,
 					text: input.text,
 					ordinal,
-					startedAt: now$111,
-					completedAt: now$111
+					startedAt: now$107,
+					completedAt: now$107
 				});
 				yield* all$5([
 					emitProviderEvent({
@@ -194514,14 +194552,14 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					message
 				});
 				if (workflow === void 0) return;
-				const now$101 = yield* now;
+				const now$112 = yield* now;
 				const progress = text$3(message.description);
 				const workflowWithThreads = withWorkflowMemberThreadIds(workflow, registered.childThreadId);
 				const task = {
 					...registered.task,
 					...progress === void 0 ? {} : { progress },
 					workflow: workflowWithThreads,
-					updatedAt: now$101
+					updatedAt: now$112
 				};
 				const coordinator = {
 					...registered,
@@ -194552,7 +194590,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 				const isNewSubagentTaskStarted = message.type === "system" && message.subtype === "task_started" && !isClaudeNonSubagentTask(message);
 				const isKnownSubagentTaskStarted = message.type === "system" && message.subtype === "task_started" && (yield* get$7(sessionSubagentsByTaskId)).has(message.task_id);
 				if (isKnownSubagentTaskStarted && message.type === "system" && message.subtype === "task_started") {
-					const now$102 = yield* now;
+					const now$113 = yield* now;
 					yield* update$4(sessionSubagentsByTaskId, (current) => {
 						const registered = current.get(message.task_id);
 						if (registered === void 0 || registered.task.status === "running") return current;
@@ -194564,9 +194602,9 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 								...priorTask,
 								status: "running",
 								result: null,
-								startedAt: now$102,
+								startedAt: now$113,
 								completedAt: null,
-								updatedAt: now$102
+								updatedAt: now$113
 							}
 						});
 					});
@@ -194699,10 +194737,10 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					if (!rateLimitInfo) return;
 					const names = adapterOptions.scopedLimitNames ? yield* get$7(adapterOptions.scopedLimitNames) : { overageIncluded: void 0 };
 					const update = claudeRateLimitEventToUpdate(rateLimitInfo, names);
-					const now$100 = yield* now;
+					const now$111 = yield* now;
 					if (update && adapterOptions.onUsageLimits) yield* adapterOptions.onUsageLimits({
 						...update,
-						checkedAt: formatIso(now$100)
+						checkedAt: formatIso(now$111)
 					});
 					const context = yield* get$7(activeTurn);
 					if (context === null) {
@@ -194728,7 +194766,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 						if (!context.announcedUsageLimits.has(limitKey)) {
 							context.announcedUsageLimits.add(limitKey);
 							const nativeItemId = `usage-limit:${context.providerTurnId}:${limitKey}`;
-							const notice = describeClaudeUsageLimit(rateLimitInfo, toEpochMillis(now$100), names);
+							const notice = describeClaudeUsageLimit(rateLimitInfo, toEpochMillis(now$111), names);
 							yield* emitProviderEvent({
 								type: "turn_item.updated",
 								driver: CLAUDE_PROVIDER,
@@ -194753,9 +194791,9 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 									status: "completed",
 									title: notice,
 									message: notice,
-									startedAt: now$100,
-									completedAt: now$100,
-									updatedAt: now$100
+									startedAt: now$111,
+									completedAt: now$111,
+									updatedAt: now$111
 								}
 							});
 						}
@@ -194891,7 +194929,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					}
 				}
 				if (message.type === "system" && message.subtype === "compact_boundary") {
-					const now$105 = yield* now;
+					const now$101 = yield* now;
 					const nativeItemId = message.uuid;
 					const postTokens = message.compact_metadata.post_tokens;
 					const afterTokenCount = typeof postTokens === "number" && Number.isFinite(postTokens) && postTokens > 0 ? Math.round(postTokens) : void 0;
@@ -194916,7 +194954,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 							tokenUsage: {
 								usedTokens: afterTokenCount,
 								maxTokens: claudeContextWindow(context.input.modelSelection),
-								updatedAt: formatIso(now$105)
+								updatedAt: formatIso(now$101)
 							}
 						}
 					});
@@ -194944,9 +194982,9 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 							driver: CLAUDE_PROVIDER,
 							status: "completed",
 							title: "Context compacted",
-							startedAt: now$105,
-							completedAt: now$105,
-							updatedAt: now$105,
+							startedAt: now$101,
+							completedAt: now$101,
+							updatedAt: now$101,
 							...message.compact_metadata.pre_tokens === void 0 ? {} : { beforeTokenCount: message.compact_metadata.pre_tokens },
 							...afterTokenCount === void 0 ? {} : { afterTokenCount }
 						}
@@ -194954,7 +194992,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					return;
 				}
 				if (message.type === "system" && message.subtype === "model_refusal_fallback") {
-					const now$115 = yield* now;
+					const now$110 = yield* now;
 					const nativeItemId = message.uuid;
 					yield* emitProviderEvent({
 						type: "turn_item.updated",
@@ -194980,9 +195018,9 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 							status: "completed",
 							title: message.content,
 							message: message.content,
-							startedAt: now$115,
-							completedAt: now$115,
-							updatedAt: now$115
+							startedAt: now$110,
+							completedAt: now$110,
+							updatedAt: now$110
 						}
 					});
 					return;
@@ -195029,8 +195067,8 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					return;
 				}
 				if (message.type === "assistant" && input.replayed !== true) {
-					const now$103 = yield* now;
-					yield* completeProviderRetry(context, now$103);
+					const now$114 = yield* now;
+					yield* completeProviderRetry(context, now$114);
 					if (message.parent_tool_use_id === null && message.message.usage !== void 0 && message.message.model !== "<synthetic>") yield* emitProviderEvent({
 						type: "provider_turn.updated",
 						driver: CLAUDE_PROVIDER,
@@ -195049,7 +195087,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 							status: "running",
 							startedAt: context.startedAt,
 							completedAt: null,
-							tokenUsage: claudeProviderTurnTokenUsage(message.message.usage, context.input.modelSelection, formatIso(now$103))
+							tokenUsage: claudeProviderTurnTokenUsage(message.message.usage, context.input.modelSelection, formatIso(now$114))
 						}
 					});
 					const parentToolUseId = message.parent_tool_use_id;
@@ -195299,7 +195337,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					const thinking = message.message.content.flatMap((block) => block.type === "thinking" && block.thinking.trim().length > 0 ? [block.thinking] : []);
 					const subagent = thinking.length === 0 ? void 0 : yield* resolveSubagentByToolUseId(context, assistantParentToolUseId);
 					if (subagent !== void 0) {
-						const now$110 = yield* now;
+						const now$105 = yield* now;
 						for (const [index, text] of thinking.entries()) {
 							const nativeItemId = `${message.uuid}:thinking:${index}`;
 							yield* emitProviderEvent({
@@ -195327,9 +195365,9 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 									text,
 									streaming: false,
 									status: "completed",
-									startedAt: now$110,
-									completedAt: now$110,
-									updatedAt: now$110
+									startedAt: now$105,
+									completedAt: now$105,
+									updatedAt: now$105
 								}
 							});
 						}
@@ -195339,7 +195377,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 				if (assistantText !== null && assistantText.text.length > 0 && assistantParentToolUseId !== null) {
 					const subagent = yield* resolveSubagentByToolUseId(context, assistantParentToolUseId);
 					if (subagent === void 0) return;
-					const now$104 = yield* now;
+					const now$115 = yield* now;
 					const nativeMessageId = message.type === "assistant" && typeof message.message.id === "string" ? message.message.id : null;
 					subagent.lastAssistantText = nativeMessageId !== null && nativeMessageId === subagent.lastAssistantMessageId ? `${subagent.lastAssistantText ?? ""}\n${assistantText.text}` : assistantText.text;
 					subagent.lastAssistantMessageId = nativeMessageId;
@@ -195350,7 +195388,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 						role: "assistant",
 						text: assistantText.text,
 						ordinal: ++subagent.nextChildItemOrdinal,
-						now: now$104
+						now: now$115
 					});
 					return;
 				}
@@ -195802,6 +195840,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					...mcpOverrides.allowedTools === void 0 ? {} : { allowedTools: mcpOverrides.allowedTools },
 					...mcpOverrides.mcpServers === void 0 ? {} : { mcpServers: mcpOverrides.mcpServers },
 					...mcpOverrides.plugins === void 0 ? {} : { plugins: mcpOverrides.plugins },
+					...mcpOverrides.sdkSettings === void 0 ? {} : { sdkSettings: mcpOverrides.sdkSettings },
 					permissionMode: queryPolicy.permissionMode,
 					...queryPolicy.allowDangerouslySkipPermissions === void 0 ? {} : { allowDangerouslySkipPermissions: queryPolicy.allowDangerouslySkipPermissions },
 					canUseTool,
@@ -195928,7 +195967,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					attachments: turnInput.message.attachments,
 					attachmentsDir,
 					fileSystem,
-					skillNames: yield* userInvocableSkillNames(turnInput.runtimePolicy.cwd),
+					skillNames: yield* userInvocableSkillNames(turnInput.runtimePolicy.cwd, turnInput.threadId),
 					uuid: promptUuid
 				});
 				const querySession = yield* openQuery(turnInput, nativeThreadId);
@@ -196096,7 +196135,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					priority: "now",
 					attachmentsDir,
 					fileSystem,
-					skillNames: yield* userInvocableSkillNames(currentTurn.input.runtimePolicy.cwd)
+					skillNames: yield* userInvocableSkillNames(currentTurn.input.runtimePolicy.cwd, currentTurn.input.threadId)
 				});
 				yield* update$4(steeredTurns, (current) => {
 					const next = new Set(current);
@@ -196282,7 +196321,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 					});
 					const nativeThreadId = yield* getNativeThreadId$1(rollbackInput.providerThread);
 					yield* closeLiveQueryForNativeThread(nativeThreadId);
-					const now$106 = yield* now;
+					const now$100 = yield* now;
 					if (rollbackInput.target.type === "thread_start") {
 						const resetNativeThreadId = yield* queryRunner.allocateSessionId;
 						return {
@@ -196295,7 +196334,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 									providerSessionId: input.providerSessionId,
 									nativeThreadId: resetNativeThreadId,
 									...rollbackInput.providerThread.forkedFrom === null ? {} : { forkedFrom: rollbackInput.providerThread.forkedFrom },
-									now: now$106
+									now: now$100
 								}),
 								handoffIds: rollbackInput.providerThread.handoffIds
 							},
@@ -196316,7 +196355,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 							},
 							status: "idle",
 							lastRunOrdinal: rollbackInput.target.appRunOrdinal,
-							updatedAt: now$106
+							updatedAt: now$100
 						},
 						providerTurns: [],
 						messages: [],
@@ -196351,7 +196390,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 						updated.add(forked.sessionId);
 						return updated;
 					});
-					const now$112 = yield* now;
+					const now$106 = yield* now;
 					return makeProviderThread$2({
 						idAllocator,
 						providerInstanceId: adapterOptions.instanceId,
@@ -196363,7 +196402,7 @@ const makeClaudeAdapterV2 = fn("makeClaudeAdapterV2")(function* (adapterOptions)
 							providerThreadId: forkInput.sourceProviderThread.id,
 							...forkInput.providerTurnId === void 0 ? {} : { providerTurnId: forkInput.providerTurnId }
 						},
-						now: now$112
+						now: now$106
 					});
 				}, (effect, forkInput) => effect.pipe(mapError((cause) => new ProviderAdapterForkThreadError({
 					driver: CLAUDE_PROVIDER,
@@ -251453,7 +251492,12 @@ const OPENCODE_RESTRICTED_PERMISSIONS = [
 * while shell/network/external access remains gated unless policy explicitly
 * allows it.
 */
-function openCodePermissionRules(runtimePolicy) {
+function openCodePermissionRules(runtimePolicy, skillOverrides = {}) {
+	const skillRules = Object.entries(skillOverrides).map(([name, enabled]) => ({
+		permission: "skill",
+		pattern: name,
+		action: enabled ? "allow" : "deny"
+	}));
 	const sandboxPolicy = recordValue(runtimePolicy, "sandboxPolicy");
 	const sandboxType = recordString$1(sandboxPolicy, "type");
 	const rawApprovalPolicy = runtimePolicy.approvalPolicy;
@@ -251466,7 +251510,7 @@ function openCodePermissionRules(runtimePolicy) {
 		permission: "*",
 		pattern: "*",
 		action: "allow"
-	}];
+	}, ...skillRules];
 	const rules = [{
 		permission: "*",
 		pattern: "*",
@@ -251537,7 +251581,7 @@ function openCodePermissionRules(runtimePolicy) {
 			});
 		}
 	}
-	return rules;
+	return [...rules, ...skillRules];
 }
 function permissionRuleEquals(left, right) {
 	return left.permission === right.permission && left.pattern === right.pattern && left.action === right.action;
@@ -251548,11 +251592,15 @@ function permissionRuleEquals(left, right) {
 * tasks. Install the complete parent policy while retaining only rules that
 * were added specifically for the selected child agent.
 */
-function openCodeChildPermissionRules(runtimePolicy, nativeChildRules) {
-	const parentRules = openCodePermissionRules(runtimePolicy);
+function openCodeChildPermissionRules(runtimePolicy, nativeChildRules, skillOverrides = {}) {
+	const parentRules = openCodePermissionRules(runtimePolicy, skillOverrides);
 	const inheritedRules = parentRules.filter((rule) => rule.permission === "external_directory" || rule.action === "deny");
 	const childSpecificRules = nativeChildRules.filter((childRule) => !inheritedRules.some((inheritedRule) => permissionRuleEquals(childRule, inheritedRule)));
-	return [...parentRules, ...childSpecificRules];
+	return [
+		...parentRules,
+		...childSpecificRules,
+		...parentRules.filter((rule) => rule.permission === "skill" && Object.hasOwn(skillOverrides, rule.pattern))
+	];
 }
 /**
 * OpenCode's fork/revert boundary is exclusive. To retain the selected app
@@ -251693,6 +251741,7 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 	const idAllocator = yield* IdAllocatorV2;
 	const host = yield* ProviderHost;
 	const mcpSessions = yield* McpProviderSessions;
+	const readUserMcpRegistry = yield* makeReader;
 	const messageIdClock = yield* make$215({
 		epochMillis: -1,
 		counter: 0
@@ -251717,6 +251766,31 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 				...connection.external && options.settings.serverPassword ? { serverPassword: options.settings.serverPassword } : {}
 			});
 			const mcpSession = yield* mcpSessions.read(input.threadId);
+			const userRegistry = yield* readUserMcpRegistry(input.threadId);
+			const userServers = serversForDriver(userRegistry, OPENCODE_PROVIDER);
+			if (connection.external && userServers.length > 0) return yield* new OpenCodeRuntimeError({
+				operation: "mcp.add",
+				detail: "P4-managed MCP servers require a local OpenCode session. Clear the OpenCode server URL to let P4 start an isolated server."
+			});
+			for (const server of userServers) {
+				const transport = server.transport;
+				yield* runOpenCodeSdk("mcp.add", (signal) => client.mcp.add({
+					name: server.name,
+					config: transport.type === "http" ? {
+						type: "remote",
+						url: transport.url,
+						headers: { ...transport.headers },
+						oauth: false
+					} : {
+						type: "local",
+						command: [transport.command, ...transport.args],
+						environment: { ...transport.env }
+					}
+				}, {
+					signal,
+					throwOnError: true
+				}));
+			}
 			const hasT3Mcp = mcpSession !== void 0 && !connection.external;
 			const orchestrationSystemPrompt = t3OrchestrationSystemPrompt(hasT3Mcp);
 			if (hasT3Mcp) yield* runOpenCodeSdk("mcp.add", () => client.mcp.add({
@@ -251728,7 +251802,7 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 					oauth: false
 				}
 			}));
-			const now$73 = yield* now;
+			const now$74 = yield* now;
 			let sessionEntity = {
 				id: input.providerSessionId,
 				driver: OPENCODE_PROVIDER,
@@ -251737,8 +251811,8 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 				cwd,
 				model: input.modelSelection.model,
 				capabilities: OpenCodeProviderCapabilitiesV2,
-				createdAt: now$73,
-				updatedAt: now$73,
+				createdAt: now$74,
+				updatedAt: now$74,
 				lastError: null
 			};
 			const events = yield* unbounded$2();
@@ -251976,7 +252050,7 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 				});
 			});
 			const emitSubagent = fnUntraced(function* (state, turn, part) {
-				const now$79 = yield* now;
+				const now$81 = yield* now;
 				const nativeItemRef = providerRef$1(part.id);
 				const nodeId = idAllocator.derive.nodeFromProviderItem({
 					driver: OPENCODE_PROVIDER,
@@ -251999,7 +252073,7 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 						parentTurn: turn,
 						prompt,
 						title,
-						startedAt: toolStartedAt(part, now$79),
+						startedAt: toolStartedAt(part, now$81),
 						childSessionId: null,
 						childThreadId: null,
 						childProviderThreadId: null,
@@ -252039,7 +252113,7 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 							prompt,
 							ordinal: itemOrdinal(turn, part.id)
 						}),
-						now: now$79,
+						now: now$81,
 						createdBy: "agent",
 						creationSource: "provider"
 					});
@@ -252057,11 +252131,11 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 						lastRunOrdinal: null,
 						handoffIds: [],
 						forkedFrom: null,
-						createdAt: now$79,
-						updatedAt: now$79
+						createdAt: now$81,
+						updatedAt: now$81
 					};
 					const nativeChildSession = unwrapData("session.get", yield* sdkCall("session.get", { sessionID: childSessionId }, () => client.session.get({ sessionID: childSessionId })));
-					const childPermission = openCodeChildPermissionRules(turn.runtimePolicy, nativeChildSession.permission ?? []);
+					const childPermission = openCodeChildPermissionRules(turn.runtimePolicy, nativeChildSession.permission ?? [], userRegistry.skillOverrides);
 					yield* sdkCall("session.update", {
 						sessionID: childSessionId,
 						permission: childPermission
@@ -252096,7 +252170,7 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 				const output = toolOutput(part);
 				if (part.state.status === "completed" && output !== void 0) context.result = output;
 				const status = toolStatus(part);
-				const completedAt = toolCompletedAt(part, now$79);
+				const completedAt = toolCompletedAt(part, now$81);
 				const subagentStatus = status.item === "failed" ? "failed" : status.item === "completed" ? "completed" : status.item === "pending" ? "pending" : "running";
 				const subagent = {
 					id: nodeId,
@@ -252117,7 +252191,7 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 					result: context.result,
 					startedAt: context.startedAt,
 					completedAt,
-					updatedAt: now$79
+					updatedAt: now$81
 				};
 				yield* emitProviderEvent({
 					type: "node.updated",
@@ -252162,7 +252236,7 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 						title,
 						startedAt: context.startedAt,
 						completedAt,
-						updatedAt: now$79,
+						updatedAt: now$81,
 						type: "subagent",
 						subagentId: nodeId,
 						origin: "provider_native",
@@ -252181,10 +252255,10 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 					return;
 				}
 				if (normalizedTool === "question") return;
-				const now$80 = yield* now;
+				const now$73 = yield* now;
 				const status = toolStatus(part);
-				const startedAt = toolStartedAt(part, now$80);
-				const completedAt = toolCompletedAt(part, now$80);
+				const startedAt = toolStartedAt(part, now$73);
+				const completedAt = toolCompletedAt(part, now$73);
 				const nativeItemRef = providerRef$1(part.id);
 				const nodeId = idAllocator.derive.nodeFromProviderItem({
 					driver: OPENCODE_PROVIDER,
@@ -252207,7 +252281,7 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 					title: toolTitle$1(part),
 					startedAt,
 					completedAt,
-					updatedAt: now$80
+					updatedAt: now$73
 				};
 				const input = toolInput(part);
 				const output = toolOutput(part);
@@ -252267,7 +252341,7 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 				});
 			});
 			const emitTodo = fnUntraced(function* (state, turn, todos) {
-				const now$77 = yield* now;
+				const now$79 = yield* now;
 				if (turn.planId === null) turn.planId = yield* idAllocator.allocate.plan({
 					threadId: turn.threadId,
 					...turn.runId === null ? {} : { runId: turn.runId },
@@ -252307,7 +252381,7 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 						runtimeRequestId: null,
 						checkpointScopeId: null,
 						startedAt: turn.startedAt,
-						completedAt: completed ? now$77 : null
+						completedAt: completed ? now$79 : null
 					}
 				});
 				yield* emitProviderEvent({
@@ -252339,8 +252413,8 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 						status: completed ? "completed" : "running",
 						title: "Todo list",
 						startedAt: turn.startedAt,
-						completedAt: completed ? now$77 : null,
-						updatedAt: now$77,
+						completedAt: completed ? now$79 : null,
+						updatedAt: now$79,
 						type: "todo_list",
 						planId,
 						steps
@@ -252393,7 +252467,7 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 			const emitRuntimeRequest = fnUntraced(function* (owner, nativeRequestId, request) {
 				if (pendingRequestsByNativeId.has(nativeRequestId)) return;
 				const { state, turn, subagent } = owner;
-				const now$74 = yield* now;
+				const now$76 = yield* now;
 				const requestId = yield* idAllocator.allocate.runtimeRequest({
 					driver: OPENCODE_PROVIDER,
 					providerTurnId: turn.providerTurnId,
@@ -252413,7 +252487,7 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 					parentNodeId: subagent?.nodeId ?? turn.rootNodeId,
 					turnItemId,
 					requestKind,
-					createdAt: now$74,
+					createdAt: now$76,
 					...request.type === "permission" ? { permission: request.value } : { question: request.value }
 				};
 				pendingRequests.set(String(requestId), pending);
@@ -252429,7 +252503,7 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 						type: "live",
 						providerSessionId: inputProviderSessionId
 					},
-					createdAt: now$74,
+					createdAt: now$76,
 					resolvedAt: null
 				};
 				state.runtimeRequests.set(String(requestId), runtimeRequest);
@@ -252450,7 +252524,7 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 						nativeItemRef: providerRef$1(nativeRequestId),
 						runtimeRequestId: requestId,
 						checkpointScopeId: null,
-						startedAt: now$74,
+						startedAt: now$76,
 						completedAt: null
 					}
 				});
@@ -252463,20 +252537,20 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 				yield* emitProviderEvent({
 					type: "turn_item.updated",
 					driver: OPENCODE_PROVIDER,
-					turnItem: runtimeRequestTurnItem(pending, "waiting", null, now$74)
+					turnItem: runtimeRequestTurnItem(pending, "waiting", null, now$76)
 				});
 				yield* updateProviderSession("waiting", null);
 			});
 			const resolveRuntimeRequest = fnUntraced(function* (nativeRequestId, status) {
 				const pending = pendingRequestsByNativeId.get(nativeRequestId);
 				if (pending === void 0) return;
-				const now$75 = yield* now;
+				const now$77 = yield* now;
 				const current = pending.state.runtimeRequests.get(String(pending.requestId));
 				if (current !== void 0) {
 					const resolved = {
 						...current,
 						status,
-						resolvedAt: now$75
+						resolvedAt: now$77
 					};
 					pending.state.runtimeRequests.set(String(pending.requestId), resolved);
 					yield* emitProviderEvent({
@@ -252504,13 +252578,13 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 						runtimeRequestId: pending.requestId,
 						checkpointScopeId: null,
 						startedAt: pending.createdAt,
-						completedAt: now$75
+						completedAt: now$77
 					}
 				});
 				yield* emitProviderEvent({
 					type: "turn_item.updated",
 					driver: OPENCODE_PROVIDER,
-					turnItem: runtimeRequestTurnItem(pending, status === "resolved" ? "completed" : "cancelled", now$75, now$75)
+					turnItem: runtimeRequestTurnItem(pending, status === "resolved" ? "completed" : "cancelled", now$77, now$77)
 				});
 				pendingRequests.delete(String(pending.requestId));
 				pendingRequestsByNativeId.delete(nativeRequestId);
@@ -252667,8 +252741,8 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 			});
 			const createChildTurn = fnUntraced(function* (state, message) {
 				if (state.appThread === null || state.parentSubagent === null) return null;
-				const now$76 = yield* now;
-				const startedAt = dateTimeFromEpoch(message.time.created, now$76);
+				const now$78 = yield* now;
+				const startedAt = dateTimeFromEpoch(message.time.created, now$78);
 				const rootNodeId = idAllocator.derive.nodeFromProviderItem({
 					driver: OPENCODE_PROVIDER,
 					nativeItemId: `${state.nativeSessionId}:root:${message.id}`
@@ -252750,7 +252824,7 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 				return turn;
 			});
 			const projectChildUserPart = fnUntraced(function* (state, turn, part) {
-				const now$78 = yield* now;
+				const now$80 = yield* now;
 				const messageId = idAllocator.derive.messageFromProviderItem({
 					driver: OPENCODE_PROVIDER,
 					nativeItemId: part.messageID
@@ -252771,7 +252845,7 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 					attachments: [],
 					streaming: false,
 					createdAt: turn.startedAt,
-					updatedAt: now$78
+					updatedAt: now$80
 				};
 				yield* emitProviderEvent({
 					type: "message.updated",
@@ -252796,8 +252870,8 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 						status: "completed",
 						title: null,
 						startedAt: projected.createdAt,
-						completedAt: now$78,
-						updatedAt: now$78,
+						completedAt: now$80,
+						updatedAt: now$80,
 						type: "user_message",
 						messageId,
 						inputIntent: "turn_start",
@@ -252809,7 +252883,7 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 			const emitCompactionItem = fn("OpenCodeAdapterV2.emitCompactionItem")(function* (state, turn) {
 				const nativeItemId = `${turn.providerTurnId}:compaction`;
 				if (turn.itemOrdinals.has(nativeItemId)) return;
-				const now$81 = yield* now;
+				const now$75 = yield* now;
 				yield* emitProviderEvent({
 					type: "turn_item.updated",
 					driver: OPENCODE_PROVIDER,
@@ -252831,8 +252905,8 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 						status: "completed",
 						title: "Context compacted",
 						startedAt: turn.startedAt,
-						completedAt: now$81,
-						updatedAt: now$81
+						completedAt: now$75,
+						updatedAt: now$75
 					}
 				});
 			});
@@ -253236,7 +253310,7 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 				hasPendingBackgroundWork: sync$1(() => busySessionIds.size > 0),
 				ensureThread: (threadInput) => gen$1(function* () {
 					if (threadInput.existingProviderThread?.nativeThreadRef != null) return yield* runtimeSession.resumeThread({ providerThread: threadInput.existingProviderThread });
-					const nativeSession = unwrapData("session.create", yield* sdkCall("session.create", { permission: openCodePermissionRules(threadInput.runtimePolicy) }, () => client.session.create({ permission: openCodePermissionRules(threadInput.runtimePolicy) })));
+					const nativeSession = unwrapData("session.create", yield* sdkCall("session.create", { permission: openCodePermissionRules(threadInput.runtimePolicy, userRegistry.skillOverrides) }, () => client.session.create({ permission: openCodePermissionRules(threadInput.runtimePolicy, userRegistry.skillOverrides) })));
 					const createdAt = yield* now;
 					const created = makeProviderThread({
 						idAllocator,
@@ -253264,6 +253338,10 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 				}))),
 				resumeThread: (threadInput) => gen$1(function* () {
 					const sessionId = nativeThreadId(threadInput.providerThread);
+					yield* sdkCall("session.update", { sessionID: sessionId }, () => client.session.update({
+						sessionID: sessionId,
+						permission: openCodePermissionRules(input.runtimePolicy, userRegistry.skillOverrides)
+					}));
 					const nativeSession = unwrapData("session.get", yield* sdkCall("session.get", { sessionID: sessionId }, () => client.session.get({ sessionID: sessionId })));
 					const resumedAt = yield* now;
 					const providerThread = {
@@ -253542,7 +253620,7 @@ const makeOpenCodeAdapterV2 = fn("makeOpenCodeAdapterV2")(function* (options) {
 						if (unwrapData("session.messages", yield* sdkCall("session.messages", { sessionID: fork.id }, () => client.session.messages({ sessionID: fork.id }))).length !== boundaryIndex) return yield* protocolError("OpenCode did not preserve the requested rewind boundary.");
 						yield* sdkCall("session.update", { sessionID: fork.id }, () => client.session.update({
 							sessionID: fork.id,
-							permission: openCodePermissionRules(input.runtimePolicy)
+							permission: openCodePermissionRules(input.runtimePolicy, userRegistry.skillOverrides)
 						}));
 						retainedThread = {
 							...rollbackInput.providerThread,
@@ -259933,6 +260011,7 @@ const makeMuseAdapterV2 = fn("makeMuseAdapterV2")(function* (options) {
 	const providerHost = yield* ProviderHost;
 	const fileSystem = yield* FileSystem;
 	const mcpSessions = yield* McpProviderSessions;
+	const readUserMcpRegistry = yield* makeReader;
 	const agentScope = yield* AgentScope;
 	const protocolError = (detail, payload) => new ProviderAdapterProtocolError({
 		driver: MUSE_PROVIDER,
@@ -261148,13 +261227,29 @@ const makeMuseAdapterV2 = fn("makeMuseAdapterV2")(function* (options) {
 				return yield* gen$1(function* () {
 					nativeSessionId = requestedId ?? host.connection.mintCommandId();
 					const mcpSession = yield* mcpSessions.read(args.threadId);
-					if (mcpSession && !host.initializeResult.grantedCapabilities.includes("sessionMcp")) return yield* protocolError("Update Muse Code to a version that supports session MCP servers");
-					const config = mcpSession ? { mcpServers: { "t3-code": {
+					const userServers = serversForDriver(yield* readUserMcpRegistry(args.threadId), MUSE_PROVIDER);
+					if ((mcpSession || userServers.length > 0) && !host.initializeResult.grantedCapabilities.includes("sessionMcp")) return yield* protocolError("Update Muse Code to a version that supports session MCP servers");
+					const mcpServers = Object.fromEntries(userServers.map(({ name, transport }) => [name, transport.type === "http" ? {
 						transport: "streamableHttp",
 						mode: "optional",
-						url: mcpSession.endpoint,
-						headers: { Authorization: mcpSession.authorizationHeader }
-					} } } : void 0;
+						url: transport.url,
+						headers: { ...transport.headers }
+					} : {
+						transport: "stdio",
+						mode: "optional",
+						command: transport.command,
+						args: [...transport.args],
+						env: { ...transport.env }
+					}]));
+					const config = mcpSession || userServers.length > 0 ? { mcpServers: {
+						...mcpServers,
+						...mcpSession ? { "t3-code": {
+							transport: "streamableHttp",
+							mode: "optional",
+							url: mcpSession.endpoint,
+							headers: { Authorization: mcpSession.authorizationHeader }
+						} } : {}
+					} } : void 0;
 					const startModel = yield* resolveModel(args.modelSelection);
 					const permissionProfile = musePermissionProfile(args.runtimePolicy.runtimeMode);
 					const result = yield* request(requestedId ? "session/resume" : "session/start", requestedId ? {
@@ -262222,6 +262317,7 @@ const makePiRpcConnection = fnUntraced(function* (options) {
 * `@earendil-works/pi-coding-agent` and `typebox` from the user's pi install.
 */
 const PI_T3_MCP_EXTENSION_FILENAME = "pi-t3-mcp-extension.ts";
+const T3_PI_USER_MCP_ENV = "T3_PI_USER_MCP_SERVERS";
 const T3_MCP_URL_ENV = "T3_MCP_URL";
 const T3_MCP_BEARER_ENV = "T3_MCP_BEARER_TOKEN";
 const T3_PI_RUNTIME_MODE_ENV = "T3_PI_RUNTIME_MODE";
@@ -262237,6 +262333,7 @@ import * as NodeFSP from "node:fs/promises";
 import * as NodePath from "node:path";
 import { Type } from "typebox";
 
+const USER_MCP_ENV = ${JSON.stringify(T3_PI_USER_MCP_ENV)};
 const URL_ENV = ${JSON.stringify(T3_MCP_URL_ENV)};
 const TOKEN_ENV = ${JSON.stringify(T3_MCP_BEARER_ENV)};
 const RUNTIME_MODE_ENV = ${JSON.stringify(T3_PI_RUNTIME_MODE_ENV)};
@@ -262547,6 +262644,12 @@ export default async function t3McpExtension(pi: ExtensionAPI) {
     }
   });
 
+  const userServers = JSON.parse(env(USER_MCP_ENV) ?? "{}") as Record<string, Parameters<ExtensionAPI["registerMcpServer"]>[1]>;
+  if (Object.keys(userServers).length > 0) {
+    if (typeof pi.registerMcpServer !== "function") throw new Error("Update Pi to 0.99 or later to use P4 MCP servers.");
+    for (const [name, config] of Object.entries(userServers)) pi.registerMcpServer(name, config);
+  }
+
   const endpoint = env(URL_ENV);
   const token = env(TOKEN_ENV);
   if (endpoint === undefined || token === undefined) {
@@ -262871,6 +262974,17 @@ function buildPiRpcLaunch(input) {
 	];
 	if (hasT3Extension && input.extensionPath !== void 0 && !hasExplicitExtension(args, input.extensionPath)) args.push("--extension", input.extensionPath);
 	const environment = { ...input.environment };
+	delete environment[T3_PI_USER_MCP_ENV];
+	if (hasT3Extension && input.userMcpServers?.length && input.userMcpNamespace) environment[T3_PI_USER_MCP_ENV] = JSON.stringify(Object.fromEntries(input.userMcpServers.map(({ name, transport }) => [`p4_${input.userMcpNamespace}_${name}`, transport.type === "http" ? {
+		url: transport.url,
+		headers: transport.headers,
+		oauth: false
+	} : {
+		command: transport.command,
+		args: transport.args,
+		env: transport.env,
+		...transport.cwd === void 0 ? {} : { cwd: transport.cwd }
+	}])));
 	delete environment[T3_MCP_URL_ENV];
 	delete environment[T3_MCP_BEARER_ENV];
 	delete environment[T3_PI_MCP_EXTENSION_PATH_ENV];
@@ -263286,6 +263400,7 @@ const makePiAdapterV2 = fn("makePiAdapterV2")(function* (options) {
 	const idAllocator = yield* IdAllocatorV2;
 	const host = yield* ProviderHost;
 	const mcpSessions = yield* McpProviderSessions;
+	const readUserMcpRegistry = yield* makeReader;
 	const { continuationRequests } = options;
 	const protocolError = (detail, payload) => new ProviderAdapterProtocolError({
 		driver: PI_PROVIDER,
@@ -263313,6 +263428,8 @@ const makePiAdapterV2 = fn("makePiAdapterV2")(function* (options) {
 				launchArgs: resolvedLaunchArgs.args,
 				environment: options.environment,
 				mcpSession,
+				userMcpServers: serversForDriver(yield* readUserMcpRegistry(input.threadId), PI_PROVIDER),
+				userMcpNamespace: input.providerSessionId.replace(/[^a-zA-Z0-9_]/g, "_"),
 				extensionPath,
 				runtimeMode: input.runtimePolicy.runtimeMode
 			});
@@ -286079,12 +286196,18 @@ const resolveUserMcpRegistry = (settings, projectId, accessTokens) => {
 			}
 		});
 	}
+	const plugins = Object.entries(settings.plugins).filter(([id]) => resolveRegistryEntryEnabled(settings, "plugins", projectId, id)).map(([, plugin]) => ({
+		name: plugin.name,
+		path: plugin.path
+	}));
+	const skillOverrides = {
+		...settings.skillOverrides,
+		...projectId === null ? {} : settings.projectSettingsOverrides[projectId]?.skillOverrides
+	};
 	return {
 		servers,
-		plugins: Object.entries(settings.plugins).filter(([id]) => resolveRegistryEntryEnabled(settings, "plugins", projectId, id)).map(([, plugin]) => ({
-			name: plugin.name,
-			path: plugin.path
-		}))
+		plugins,
+		...Object.keys(skillOverrides).length ? { skillOverrides } : {}
 	};
 };
 /** First line of a failure, bounded, for the settings page. Never a header or env value. */
@@ -286144,6 +286267,7 @@ var McpRegistry = class extends Service$3()("@p4code/cli/mcp/McpRegistry") {};
 const make$76 = gen$1(function* () {
 	const settingsService = yield* ServerSettingsService;
 	const oauth = yield* McpClientOAuth;
+	const self = yield* resolveSelfInvocation();
 	const health = /* @__PURE__ */ new Map();
 	const getSettings = settingsService.getSettings.pipe(mapError((cause) => new McpRegistrySettingsError({ cause })));
 	const accessTokenFor = (id, server) => server.transport.type === "http" && server.transport.auth === "oauth" ? oauth.accessToken({
@@ -286158,7 +286282,14 @@ const make$76 = gen$1(function* () {
 			const token = yield* accessTokenFor(id, server).pipe(timeoutOption(TOKEN_REFRESH_TIMEOUT), map$11(flatten));
 			if (isSome(token)) tokens.set(id, token.value);
 		}
-		return resolveUserMcpRegistry(settings, projectId, tokens);
+		const registry = resolveUserMcpRegistry(settings, projectId, tokens);
+		return {
+			...registry,
+			servers: registry.servers.map((server) => ({
+				...server,
+				transport: server.transport.type === "stdio" ? withStdioWorkingDirectory(server.transport, self) : server.transport
+			}))
+		};
 	}).pipe(catch_((error) => logWarning$1("failed to resolve the MCP registry", { cause: error }).pipe(as({
 		servers: [],
 		plugins: []
@@ -325291,7 +325422,6 @@ const summarize = (transport) => {
 	const command = transport.command.split(/[\\/]/).at(-1) ?? transport.command;
 	return transport.args[0] && !transport.args[0].startsWith("-") ? `${command} ${transport.args[0]}`.slice(0, 120) : command;
 };
-const sameTarget = (a, b) => a.type === "http" && b.type === "http" ? a.url === b.url : a.type === "stdio" && b.type === "stdio" && a.command === b.command && a.args.join("\0") === b.args.join("\0");
 var McpConfigDiscovery = class extends Service$3()("@p4code/cli/mcp/McpConfigDiscovery") {};
 const make$21 = gen$1(function* () {
 	const fileSystem = yield* FileSystem;
@@ -325301,6 +325431,7 @@ const make$21 = gen$1(function* () {
 	const settingsService = yield* ServerSettingsService;
 	const projects = yield* serviceOption(ProjectService);
 	const home = OS.homedir();
+	const importLock = yield* make$259(1);
 	const readJson = (file) => fileSystem.readFileString(file).pipe(option$1, map$11(flatMap$2(decodeJson)));
 	const fromJsonServers = (provider, file, servers) => isRecord(servers) ? Object.entries(servers).flatMap(([name, entry]) => {
 		const transport = transportFromJsonEntry(entry);
@@ -325362,7 +325493,17 @@ const make$21 = gen$1(function* () {
 			if (isSome(json) && isRecord(json.value)) results.push(...fromJsonServers(provider, file, json.value.mcpServers));
 		}
 		results.push(...yield* codexServers(root ?? home));
-		return results;
+		return results.map((server) => {
+			const transport = server.transport;
+			if (server.provider === "codex" || transport.type !== "http" || transport.auth !== "none" || Object.keys(transport.headers).length > 0) return server;
+			return results.some((other) => other.provider === "codex" && other.transport.type === "http" && other.transport.url === transport.url && other.transport.auth === "oauth" && Object.keys(other.transport.headers).length === 0) ? {
+				...server,
+				transport: {
+					...transport,
+					auth: "oauth"
+				}
+			} : server;
+		});
 	});
 	const discover = (projectId) => gen$1(function* () {
 		const settings = yield* settingsService.getSettings.pipe(option$1);
@@ -325370,13 +325511,24 @@ const make$21 = gen$1(function* () {
 			onNone: () => [],
 			onSome: (value) => Object.values(value.mcpServers)
 		});
-		return (yield* found(projectId)).map((server) => ({
+		const groups = [];
+		for (const server of yield* found(projectId)) {
+			const group = groups.find((entry) => NodeUtil.isDeepStrictEqual(entry.server.transport, server.transport));
+			if (group) {
+				if (!group.providers.includes(server.provider)) group.providers.push(server.provider);
+			} else groups.push({
+				server,
+				providers: [server.provider]
+			});
+		}
+		return groups.map(({ server, providers }) => ({
 			provider: server.provider,
+			providers,
 			path: server.path,
 			name: server.name,
 			type: server.transport.type,
 			summary: summarize(server.transport),
-			alreadyAdded: registry.some((entry) => entry.name === server.name || sameTarget(entry.transport, server.transport))
+			alreadyAdded: registry.some((entry) => NodeUtil.isDeepStrictEqual(entry.transport, server.transport))
 		}));
 	});
 	const importServers = (input) => gen$1(function* () {
@@ -325387,12 +325539,19 @@ const make$21 = gen$1(function* () {
 		})));
 		const taken = new Set(Object.values(settings.mcpServers).map((server) => server.name));
 		const patch = {};
+		const imported = /* @__PURE__ */ new Set();
 		for (const wanted of input.servers) {
 			const source = available.find((server) => server.provider === wanted.provider && server.path === wanted.path && server.name === wanted.name);
 			if (source === void 0) return yield* new McpImportError({ reason: "not-found" });
+			const existing = [...Object.entries(settings.mcpServers), ...Object.entries(patch)].find(([, server]) => NodeUtil.isDeepStrictEqual(server.transport, source.transport));
+			if (existing) {
+				imported.add(McpServerId.make(existing[0]));
+				continue;
+			}
 			const name = registryNameFor(source.name, taken);
 			taken.add(name);
 			const id = McpServerId.make(yield* crypto.randomUUIDv4().pipe(orDie));
+			imported.add(id);
 			patch[id] = {
 				name,
 				enabled: true,
@@ -325404,12 +325563,12 @@ const make$21 = gen$1(function* () {
 				}
 			};
 		}
-		yield* settingsService.updateSettings({ mcpServers: patch }).pipe(mapError((cause) => new McpImportError({
+		if (Object.keys(patch).length > 0) yield* settingsService.updateSettings({ mcpServers: patch }).pipe(mapError((cause) => new McpImportError({
 			reason: "settings",
 			cause
 		})));
-		return Object.keys(patch);
-	});
+		return [...imported];
+	}).pipe(importLock.withPermits(1));
 	return McpConfigDiscovery.of({
 		discover,
 		import: importServers
@@ -345971,4 +346130,4 @@ function runCli() {
 //#endregion
 export { runCli };
 
-//# sourceMappingURL=binCli-DouSNynJ.mjs.map
+//# sourceMappingURL=binCli-Bgjc_5FL.mjs.map