@p4code/cli 0.1.14 → 0.1.16

package/dist/bin.mjs

@@ -121,7 +121,7 @@ const closeServer = (server) => {
 * NetService - Service tag for startup networking helpers.
 */
 var NetService = class extends Context.Service()("@p4code/shared/Net/NetService") {};
-const make$74 = () => {
+const make$75 = () => {
 	/**
 	* Returns true when a TCP server can bind to {host, port}.
 	* `EADDRNOTAVAIL` is treated as available so IPv6-absent hosts don't fail
@@ -230,10 +230,10 @@ const make$74 = () => {
 		})
 	};
 };
-const layer$70 = Layer.sync(NetService, make$74);
+const layer$71 = Layer.sync(NetService, make$75);
 //#endregion
 //#region package.json
-var version = "0.1.14";
+var version = "0.1.16";
 //#endregion
 //#region src/config.ts
 /**
@@ -254,8 +254,8 @@ var ServerConfig$1 = class extends Context.Service()("@p4code/cli/config/ServerC
 	/** @deprecated Import and use `layerTest` from this module. */
 	static layerTest = (cwd, baseDirOrPrefix) => layerTest$2(cwd, baseDirOrPrefix);
 };
-const make$73 = (config) => ServerConfig$1.of(config);
-const layer$69 = (config) => Layer.succeed(ServerConfig$1, make$73(config));
+const make$74 = (config) => ServerConfig$1.of(config);
+const layer$70 = (config) => Layer.succeed(ServerConfig$1, make$74(config));
 const deriveServerPaths = Effect.fn(function* (baseDir, devUrl, options = {}) {
 	const { join } = yield* Path.Path;
 	const stateDir = join(baseDir, devUrl !== void 0 && !options.baseDirIsExplicit ? "dev" : "userdata");
@@ -5024,14 +5024,18 @@ const UserInputResolvedPayload = Schema$1.Struct({ answers: UnknownRecordSchema
 const TaskStartedPayload = Schema$1.Struct({
 	taskId: RuntimeTaskId,
 	description: Schema$1.optional(TrimmedNonEmptyStringSchema$1),
-	taskType: Schema$1.optional(TrimmedNonEmptyStringSchema$1)
+	taskType: Schema$1.optional(TrimmedNonEmptyStringSchema$1),
+	toolUseId: Schema$1.optional(TrimmedNonEmptyStringSchema$1),
+	subagentType: Schema$1.optional(TrimmedNonEmptyStringSchema$1)
 });
 const TaskProgressPayload = Schema$1.Struct({
 	taskId: RuntimeTaskId,
 	description: TrimmedNonEmptyStringSchema$1,
 	summary: Schema$1.optional(TrimmedNonEmptyStringSchema$1),
 	usage: Schema$1.optional(Schema$1.Unknown),
-	lastToolName: Schema$1.optional(TrimmedNonEmptyStringSchema$1)
+	lastToolName: Schema$1.optional(TrimmedNonEmptyStringSchema$1),
+	toolUseId: Schema$1.optional(TrimmedNonEmptyStringSchema$1),
+	subagentType: Schema$1.optional(TrimmedNonEmptyStringSchema$1)
 });
 const TaskCompletedPayload = Schema$1.Struct({
 	taskId: RuntimeTaskId,
@@ -5041,7 +5045,8 @@ const TaskCompletedPayload = Schema$1.Struct({
 		"stopped"
 	]),
 	summary: Schema$1.optional(TrimmedNonEmptyStringSchema$1),
-	usage: Schema$1.optional(Schema$1.Unknown)
+	usage: Schema$1.optional(Schema$1.Unknown),
+	toolUseId: Schema$1.optional(TrimmedNonEmptyStringSchema$1)
 });
 const HookStartedPayload = Schema$1.Struct({
 	hookId: TrimmedNonEmptyStringSchema$1,
@@ -7054,14 +7059,28 @@ const TASK_ASSIGNEE_MAX_LENGTH = 128;
 * Board columns, in board order. `backlog` is the default for newly created
 * tasks — an agent filing a task mid-session is recording work that exists, not
 * committing to doing it next.
+*
+* `cancelled` is the other way a task closes: decided against, superseded or
+* merged into another task. Marking such a task `done` is the workaround it
+* replaces, and it lies - a board that says five things finished when two of
+* them were dropped is not worth reading.
 */
 const TaskStatus = Schema$1.Literals([
 	"backlog",
 	"todo",
 	"in_progress",
 	"in_review",
-	"done"
+	"done",
+	"cancelled"
 ]);
+/**
+* What a status this build has never heard of decodes to when read back.
+*
+* `backlog` is the least dishonest guess: it says "recorded, nothing claimed
+* about it", which is true of a status we cannot interpret. Guessing `done` or
+* `cancelled` would claim the task is closed.
+*/
+const UNKNOWN_TASK_STATUS_FALLBACK = "backlog";
 const TaskPriority = Schema$1.Literals([
 	"none",
 	"low",
@@ -7093,7 +7112,19 @@ const ProjectIdField = ProjectId.pipe(Schema$1.annotateEncoded({ description: "I
 const ThreadIdField = ThreadId.pipe(Schema$1.annotateEncoded({ description: "Id of the agent thread working this task." }));
 const TitleField = TrimmedNonEmptyString.check(Schema$1.isMaxLength(TASK_TITLE_MAX_LENGTH)).pipe(Schema$1.annotateEncoded({ description: "One-line summary of the work. Required." }));
 const BodyField = Schema$1.String.pipe(Schema$1.annotateEncoded({ description: "Markdown detail: context, acceptance criteria, links." }));
-const StatusField = TaskStatus.pipe(Schema$1.annotateEncoded({ description: "Board column: backlog (recorded, not queued), todo (queued next), in_progress, in_review, done." }));
+const StatusField = TaskStatus.pipe(Schema$1.annotateEncoded({ description: "Board column: backlog (recorded, not queued), todo (queued next), in_progress, in_review, done, cancelled (closed without doing the work)." }));
+/**
+* The status as read back from a store, tolerant of values this build predates.
+*
+* A board can be shared between machines running different versions, and a
+* newer peer may write a status added after this client shipped. A strict
+* literal would fail the decode of the whole page, so one unknown row would
+* blank the board behind a "hub is unavailable" error rather than degrade. An
+* unrecognized status therefore decodes to {@link UNKNOWN_TASK_STATUS_FALLBACK},
+* same spirit as the nullable `readableId` and `orderKey` below. Encoding stays
+* strict: this client can only ever write a status it knows.
+*/
+const StoredStatusField = TaskStatus.pipe(Schema$1.catchDecoding(() => Effect.succeedSome(UNKNOWN_TASK_STATUS_FALLBACK)));
 const PriorityField = TaskPriority.pipe(Schema$1.annotateEncoded({ description: "Relative urgency: none, low, medium, high or urgent." }));
 const AssigneeField = TrimmedNonEmptyString.check(Schema$1.isMaxLength(TASK_ASSIGNEE_MAX_LENGTH)).pipe(Schema$1.annotateEncoded({ description: "Who owns the task — a person's handle or an agent name." }));
 /**
@@ -7161,7 +7192,7 @@ const Task = Schema$1.Struct({
 	threadId: Schema$1.NullOr(ThreadId),
 	title: TrimmedNonEmptyString.check(Schema$1.isMaxLength(TASK_TITLE_MAX_LENGTH)),
 	body: Schema$1.String,
-	status: TaskStatus,
+	status: StoredStatusField,
 	priority: TaskPriority,
 	assignee: Schema$1.NullOr(TrimmedNonEmptyString.check(Schema$1.isMaxLength(TASK_ASSIGNEE_MAX_LENGTH))),
 	labels: Schema$1.Array(TaskLabel).check(Schema$1.isMaxLength(TASK_LABELS_MAX_COUNT)),
@@ -8217,17 +8248,62 @@ const McpServerOAuthStatus = Schema$1.Struct({
 * unusable *here*, and saying which slot is empty is the difference between a
 * fixable state and a mystery.
 */
+/**
+* Where a listed server lives, which is also where an edit goes.
+*
+* `claude` is the CLI's user scope (`~/.claude.json`) — the primary home,
+* because every Claude Code session reads it, inside p4code and out.
+* `project` is one workspace project's `.mcp.json`, committed with the repo.
+* `registry` is p4code's own store, the only one that syncs through the hub
+* and carries secret slots.
+*/
+const McpServerSource = Schema$1.Literals([
+	"registry",
+	"claude",
+	"project"
+]);
 const McpServerStatus = Schema$1.Struct({
 	registration: McpServerRegistration,
 	missingSecrets: Schema$1.Array(McpSecretSlot),
 	/** True when this machine holds everything needed to start it. */
 	ready: Schema$1.Boolean,
 	/** Absent for servers that never challenged and hold no token here. */
-	oauth: Schema$1.optional(McpServerOAuthStatus)
+	oauth: Schema$1.optional(McpServerOAuthStatus),
+	/** Absent means `registry`, which every row was before this field existed. */
+	source: Schema$1.optional(McpServerSource),
+	/** The workspace root whose `.mcp.json` holds this row. `project` rows only. */
+	projectDir: Schema$1.optional(Schema$1.String)
+});
+/** A workspace project the panel can scope a server to. */
+const McpProjectRef = Schema$1.Struct({
+	dir: Schema$1.String,
+	title: Schema$1.String
+});
+const McpServerList = Schema$1.Struct({
+	servers: Schema$1.Array(McpServerStatus),
+	/**
+	* The projects whose `.mcp.json` can be edited, for the add dialog's scope
+	* picker. Carried with the list so the panel needs no second request.
+	*/
+	projects: Schema$1.optional(Schema$1.Array(McpProjectRef))
+});
+/**
+* `source` routes the write: `claude` edits the `mcpServers` key of the
+* CLI's user-scope file, `registry` (or absent) writes p4code's own store.
+* The user-scope file is the primary home — it is what every Claude Code
+* session reads, in and out of p4code — so the panel defaults to it.
+*/
+const McpServerSaveInput = Schema$1.Struct({
+	registration: McpServerRegistration,
+	source: Schema$1.optional(McpServerSource),
+	/** Required when `source` is `project`: the workspace root to write into. */
+	projectDir: Schema$1.optional(Schema$1.String)
+});
+const McpServerNameInput = Schema$1.Struct({
+	name: McpServerName,
+	source: Schema$1.optional(McpServerSource),
+	projectDir: Schema$1.optional(Schema$1.String)
 });
-const McpServerList = Schema$1.Struct({ servers: Schema$1.Array(McpServerStatus) });
-const McpServerSaveInput = Schema$1.Struct({ registration: McpServerRegistration });
-const McpServerNameInput = Schema$1.Struct({ name: McpServerName });
 /**
 * Setting one secret value, on this machine only.
 *
@@ -9405,7 +9481,7 @@ function deriveAuthClientMetadata(input) {
 //#endregion
 //#region src/auth/EnvironmentAuthPolicy.ts
 var EnvironmentAuthPolicy = class extends Context.Service()("@p4code/cli/auth/EnvironmentAuthPolicy") {};
-const make$72 = Effect.gen(function* () {
+const make$73 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const isRemoteReachable = isRemoteReachableHost(config.host);
 	const policy = config.mode === "desktop" ? isRemoteReachable ? "remote-reachable" : "desktop-managed-local" : isRemoteReachable ? "remote-reachable" : "loopback-browser";
@@ -9423,7 +9499,7 @@ const make$72 = Effect.gen(function* () {
 	};
 	return EnvironmentAuthPolicy.of({ getDescriptor: () => Effect.succeed(descriptor).pipe(Effect.withSpan("EnvironmentAuthPolicy.getDescriptor")) });
 });
-const layer$68 = Layer.effect(EnvironmentAuthPolicy, make$72);
+const layer$69 = Layer.effect(EnvironmentAuthPolicy, make$73);
 //#endregion
 //#region src/persistence/Errors.ts
 function summarizeSchemaIssue(issue) {
@@ -9604,7 +9680,7 @@ function toPersistenceSqlOrDecodeError$6(sqlOperation, decodeOperation, correlat
 		cause
 	});
 }
-const make$71 = Effect.gen(function* () {
+const make$72 = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
 	const createSessionRow = SqlSchema.void({
 		Request: CreateAuthSessionInput,
@@ -9738,7 +9814,7 @@ const make$71 = Effect.gen(function* () {
 		setLastConnectedAt
 	};
 });
-const layer$67 = Layer.effect(AuthSessionRepository, make$71);
+const layer$68 = Layer.effect(AuthSessionRepository, make$72);
 //#endregion
 //#region src/auth/ServerSecretStore.ts
 const secretStoreErrorContext = {
@@ -9805,7 +9881,7 @@ const isSecretStoreError = Schema$1.is(SecretStoreError);
 const isPlatformError = (value) => Predicate.isTagged(value, "PlatformError");
 const isSecretAlreadyExistsError = (error) => "cause" in error && isPlatformError(error.cause) && error.cause.reason._tag === "AlreadyExists";
 var ServerSecretStore = class extends Context.Service()("@p4code/cli/auth/ServerSecretStore") {};
-const make$70 = Effect.gen(function* () {
+const make$71 = Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
@@ -9875,7 +9951,7 @@ const make$70 = Effect.gen(function* () {
 		remove
 	});
 });
-const layer$66 = Layer.effect(ServerSecretStore, make$70);
+const layer$67 = Layer.effect(ServerSecretStore, make$71);
 //#endregion
 //#region src/auth/SessionStore.ts
 var MalformedSessionTokenError = class extends Schema$1.TaggedErrorClass()("MalformedSessionTokenError", {}) {
@@ -10113,7 +10189,7 @@ function toAuthClientSession(input) {
 		current: false
 	};
 }
-const make$69 = Effect.gen(function* () {
+const make$70 = Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const serverConfig = yield* ServerConfig$1;
 	const secretStore = yield* ServerSecretStore;
@@ -10427,7 +10503,7 @@ const make$69 = Effect.gen(function* () {
 		markDisconnected
 	});
 });
-const layer$65 = Layer.effect(SessionStore, make$69).pipe(Layer.provideMerge(layer$67));
+const layer$66 = Layer.effect(SessionStore, make$70).pipe(Layer.provideMerge(layer$68));
 //#endregion
 //#region src/persistence/AuthPairingLinks.ts
 const AuthPairingLinkRecord = Schema$1.Struct({
@@ -10488,7 +10564,7 @@ function toPersistenceSqlOrDecodeError$5(sqlOperation, decodeOperation, correlat
 		cause
 	});
 }
-const make$68 = Effect.gen(function* () {
+const make$69 = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
 	const createPairingLinkRow = SqlSchema.void({
 		Request: CreateAuthPairingLinkInput,
@@ -10623,7 +10699,7 @@ const make$68 = Effect.gen(function* () {
 		getByCredential
 	};
 });
-const layer$64 = Layer.effect(AuthPairingLinkRepository, make$68);
+const layer$65 = Layer.effect(AuthPairingLinkRepository, make$69);
 //#endregion
 //#region src/auth/PairingGrantStore.ts
 var UnknownBootstrapCredentialError = class extends Schema$1.TaggedErrorClass()("UnknownBootstrapCredentialError", {}) {
@@ -10718,7 +10794,7 @@ const DEV_STARTUP_TTL_HOURS = Duration.hours(24);
 const PAIRING_TOKEN_ALPHABET = "23456789ABCDEFGHJKLMNPQRSTUVWXYZ";
 const PAIRING_TOKEN_LENGTH = 12;
 const PAIRING_TOKEN_REJECTION_LIMIT = Math.floor(256 / 32) * 32;
-const make$67 = Effect.gen(function* () {
+const make$68 = Effect.gen(function* () {
 	const crypto = yield* Crypto.Crypto;
 	const config = yield* ServerConfig$1;
 	const pairingLinks = yield* AuthPairingLinkRepository;
@@ -10916,7 +10992,7 @@ const make$67 = Effect.gen(function* () {
 		consume
 	});
 });
-const layer$63 = Layer.effect(PairingGrantStore, make$67).pipe(Layer.provideMerge(layer$64));
+const layer$64 = Layer.effect(PairingGrantStore, make$68).pipe(Layer.provideMerge(layer$65));
 //#endregion
 //#region src/persistence/Migrations/001_OrchestrationEvents.ts
 var _001_OrchestrationEvents_default = Effect.gen(function* () {
@@ -12771,7 +12847,7 @@ function parseBearerToken(request) {
 	const token = header.slice(7).trim();
 	return token.length > 0 ? token : null;
 }
-const make$66 = Effect.gen(function* () {
+const make$67 = Effect.gen(function* () {
 	const policy = yield* EnvironmentAuthPolicy;
 	const bootstrapCredentials = yield* PairingGrantStore;
 	const sessions = yield* SessionStore;
@@ -12966,9 +13042,9 @@ const make$66 = Effect.gen(function* () {
 		issueStartupPairingUrl
 	});
 });
-const layer$62 = Layer.effect(EnvironmentAuth, make$66).pipe(Layer.provideMerge(layer$63), Layer.provideMerge(layer$65), Layer.provideMerge(layer$68));
-const storageLayer = Layer.mergeAll(layer$66, layerConfig);
-const runtimeLayer = layer$62.pipe(Layer.provideMerge(storageLayer));
+const layer$63 = Layer.effect(EnvironmentAuth, make$67).pipe(Layer.provideMerge(layer$64), Layer.provideMerge(layer$66), Layer.provideMerge(layer$69));
+const storageLayer = Layer.mergeAll(layer$67, layerConfig);
+const runtimeLayer = layer$63.pipe(Layer.provideMerge(storageLayer));
 //#endregion
 //#region src/cliAuthFormat.ts
 const newline = "\n";
@@ -13723,7 +13799,7 @@ const runWithEnvironmentAuth = (flags, run, options) => Effect.gen(function* ()
 	}
 	return yield* Effect.gen(function* () {
 		return yield* run(yield* EnvironmentAuth);
-	}).pipe(Effect.provide(Layer.mergeAll(runtimeLayer).pipe(Layer.provide(layer$69(config)), Layer.provide(Layer.succeed(References.MinimumLogLevel, minimumLogLevel)))));
+	}).pipe(Effect.provide(Layer.mergeAll(runtimeLayer).pipe(Layer.provide(layer$70(config)), Layer.provide(Layer.succeed(References.MinimumLogLevel, minimumLogLevel)))));
 });
 const ttlFlag = Flag.string("ttl").pipe(Flag.withSchema(DurationFromString), Flag.withDescription("TTL, for example `5m`, `1h`, `30d`, or `15 minutes`."), Flag.optional);
 const jsonFlag = Flag.boolean("json").pipe(Flag.withDescription("Emit JSON instead of human-readable output."), Flag.withDefault(false));
@@ -13863,7 +13939,7 @@ const DEFAULT_LIMITS = {
 	windowMillis: FAILURE_WINDOW_MS,
 	blockMillis: BLOCK_DURATION_MS
 };
-const make$65 = Effect.fn("HubAuthThrottle.make")(function* (limits = DEFAULT_LIMITS) {
+const make$66 = Effect.fn("HubAuthThrottle.make")(function* (limits = DEFAULT_LIMITS) {
 	const state = yield* Ref.make(initialThrottleState);
 	return HubAuthThrottle.of({
 		shouldRefuse: Effect.gen(function* () {
@@ -13877,7 +13953,7 @@ const make$65 = Effect.fn("HubAuthThrottle.make")(function* (limits = DEFAULT_LI
 		})
 	});
 });
-const layer$61 = Layer.effect(HubAuthThrottle, make$65());
+const layer$62 = Layer.effect(HubAuthThrottle, make$66());
 //#endregion
 //#region src/hub/HubAuth.ts
 /**
@@ -14676,7 +14752,7 @@ const deleteAssetRoute = HttpRouter.add("DELETE", "/assets/:kind/:name", respond
 	const outcome = yield* (yield* AgentAssetRepository).deleteByName(requested);
 	return outcome._tag === "conflict" ? assetConflict(Option.getOrNull(outcome.current)) : HttpServerResponse.empty({ status: 204 });
 })));
-const layer$60 = Layer.mergeAll(healthRoute, listTasksRoute, getTaskRoute, createTaskRoute, updateTaskRoute, deleteTaskRoute, listAssetsRoute, getAssetRoute, putAssetRoute, deleteAssetRoute);
+const layer$61 = Layer.mergeAll(healthRoute, listTasksRoute, getTaskRoute, createTaskRoute, updateTaskRoute, deleteTaskRoute, listAssetsRoute, getAssetRoute, putAssetRoute, deleteAssetRoute);
 //#endregion
 //#region src/hub/Migrations/001_Tasks.ts
 /**
@@ -14955,7 +15031,7 @@ const announce = Layer.effectDiscard(Effect.gen(function* () {
 	});
 	if (isRemoteReachableHost(config.host)) yield* Effect.logWarning("Hub is reachable beyond loopback. The bearer token is the only control — repeated auth failures are not rate limited.", { host: config.host });
 }));
-const makeHubLayer = HttpRouter.serve(layer$60).pipe(Layer.provideMerge(announce), Layer.provideMerge(HubHttpServerLive), Layer.provideMerge(layer$61), Layer.provideMerge(TaskRepositoryLive), Layer.provideMerge(AgentAssetRepositoryLive), Layer.provideMerge(HubPersistenceLive));
+const makeHubLayer = HttpRouter.serve(layer$61).pipe(Layer.provideMerge(announce), Layer.provideMerge(HubHttpServerLive), Layer.provideMerge(layer$62), Layer.provideMerge(TaskRepositoryLive), Layer.provideMerge(AgentAssetRepositoryLive), Layer.provideMerge(HubPersistenceLive));
 const runHub = Layer.launch(makeHubLayer);
 //#endregion
 //#region src/atomicWrite.ts
@@ -15079,7 +15155,7 @@ function stripDefaultServerSettings(current, defaults) {
 	}
 	return Object.is(current, defaults) ? void 0 : current;
 }
-const make$64 = Effect.gen(function* () {
+const make$65 = Effect.gen(function* () {
 	const { settingsPath } = yield* ServerConfig$1;
 	const fs = yield* FileSystem.FileSystem;
 	const pathService = yield* Path.Path;
@@ -15300,7 +15376,7 @@ const make$64 = Effect.gen(function* () {
 		}
 	};
 });
-const layer$59 = Layer.effect(ServerSettingsService, make$64);
+const layer$60 = Layer.effect(ServerSettingsService, make$65);
 //#endregion
 //#region src/pathExpansion.ts
 /**
@@ -15510,6 +15586,192 @@ const discoverClaudeSkills = Effect.fn("discoverClaudeSkills")(function* (config
 	return [...skillsByName.values()].sort((left, right) => left.name.localeCompare(right.name));
 });
 //#endregion
+//#region src/mcp/ClaudeMcpFiles.ts
+/**
+* The MCP servers in Claude Code's own configuration files.
+*
+* Two homes, both the CLI's and both primary over p4code's registry:
+*
+* - **User scope**: the `mcpServers` key of `~/.claude.json`. Every Claude
+*   Code session reads it, inside p4code and out.
+* - **Project scope**: `<project>/.mcp.json`, committed with the repository
+*   and read by every session working in it.
+*
+* The settings panel manages both directly — list, add, edit, remove — so
+* this service writes them. **A user-scope write touches only the
+* `mcpServers` key**; `~/.claude.json` also holds `oauthAccount`, `machineID`
+* and a `projects` map, and everything outside the one key is carried
+* through a write as parsed. This is the same read-modify-write the
+* `claude mcp add` command performs, with the same last-writer-wins caveat
+* when a CLI session saves concurrently.
+*
+* A malformed entry, a name that would not survive as a registry filename, or
+* a missing file all cost only what they describe: that entry, or that one
+* file's list, never the panel.
+*
+* @module mcp/ClaudeMcpFiles
+*/
+const isServerName = Schema$1.is(McpServerName);
+/** The file a project's scope lives in, beside its lockfiles and dotfiles. */
+const PROJECT_MCP_FILENAME = ".mcp.json";
+/**
+* One entry as the CLI writes it. `type` is absent for the CLI's original
+* stdio-only shape, so it defaults rather than discriminates.
+*/
+const ClaudeMcpEntry = Schema$1.Struct({
+	type: Schema$1.optional(Schema$1.Literals([
+		"stdio",
+		"http",
+		"sse"
+	])),
+	command: Schema$1.optional(Schema$1.String),
+	args: Schema$1.optional(Schema$1.Array(Schema$1.String)),
+	env: Schema$1.optional(Schema$1.Record(Schema$1.String, Schema$1.String)),
+	url: Schema$1.optional(Schema$1.String),
+	headers: Schema$1.optional(Schema$1.Record(Schema$1.String, Schema$1.String))
+});
+/**
+* A config file as this service needs to see it: the one key it owns, with
+* every other key carried as parsed. Both `~/.claude.json` and `.mcp.json`
+* decode through this — the former has many other keys, the latter none.
+*/
+const McpConfigFile = Schema$1.StructWithRest(Schema$1.Struct({ mcpServers: Schema$1.optional(Schema$1.Record(Schema$1.String, Schema$1.Unknown)) }), [Schema$1.Record(Schema$1.String, Schema$1.Unknown)]);
+const McpConfigFileFromJson = Schema$1.fromJsonString(McpConfigFile);
+const decodeConfigFile = Schema$1.decodeUnknownExit(McpConfigFileFromJson);
+const encodeConfigFile = Schema$1.encodeSync(McpConfigFileFromJson);
+const decodeEntry = Schema$1.decodeUnknownExit(ClaudeMcpEntry);
+/** Where the CLI keeps user scope: `$CLAUDE_CONFIG_DIR/.claude.json` when set, else `~/.claude.json`. */
+const claudeUserConfigPath = Effect.fn("claudeUserConfigPath")(function* () {
+	const path = yield* Path.Path;
+	const configDir = process.env["CLAUDE_CONFIG_DIR"]?.trim() ?? "";
+	return configDir.length > 0 ? path.join(path.resolve(configDir), ".claude.json") : path.join(NodeOS.homedir(), ".claude.json");
+});
+/**
+* Map one CLI entry to a registration, or nothing when it cannot be one.
+*
+* `enabled: true` because presence in the CLI's file is what enabled means
+* there. Exported for tests.
+*/
+function registrationFromClaudeEntry(name, entry) {
+	if (!isServerName(name)) return void 0;
+	const decoded = decodeEntry(entry);
+	if (decoded._tag !== "Success") return void 0;
+	const value = decoded.value;
+	const type = value.type ?? "stdio";
+	if (type === "stdio") {
+		if (value.command === void 0 || value.command.trim().length === 0) return void 0;
+		return {
+			name,
+			transport: "stdio",
+			enabled: true,
+			command: value.command,
+			...value.args !== void 0 && value.args.length > 0 ? { args: value.args } : {},
+			...value.env !== void 0 && Object.keys(value.env).length > 0 ? { env: value.env } : {}
+		};
+	}
+	if (value.url === void 0 || value.url.trim().length === 0) return void 0;
+	return {
+		name,
+		transport: type,
+		enabled: true,
+		url: value.url,
+		...value.headers !== void 0 && Object.keys(value.headers).length > 0 ? { headers: value.headers } : {}
+	};
+}
+/**
+* The inverse mapping, for writes. `enabled` is dropped: the CLI has no such
+* flag, and presence in the file is what enabled means there. Exported for
+* tests, so the two mappings can be checked as a round trip.
+*/
+function claudeEntryFromRegistration(registration) {
+	if (registration.transport === "stdio") return {
+		type: "stdio",
+		command: registration.command,
+		...registration.args !== void 0 && registration.args.length > 0 ? { args: registration.args } : {},
+		...registration.env !== void 0 && Object.keys(registration.env).length > 0 ? { env: registration.env } : {}
+	};
+	return {
+		type: registration.transport,
+		url: registration.url,
+		...registration.headers !== void 0 && Object.keys(registration.headers).length > 0 ? { headers: registration.headers } : {}
+	};
+}
+var ClaudeMcpFiles = class extends Context.Service()("@p4code/cli/mcp/ClaudeMcpFiles") {};
+const make$64 = Effect.gen(function* () {
+	const fileSystem = yield* FileSystem.FileSystem;
+	const path = yield* Path.Path;
+	const services = yield* Effect.context();
+	const readEntries = Effect.fn("ClaudeMcpFiles.readEntries")(function* (filePath) {
+		const raw = yield* fileSystem.readFileString(filePath).pipe(Effect.orElseSucceed(() => void 0));
+		if (raw === void 0) return [];
+		const decoded = decodeConfigFile(raw);
+		if (decoded._tag !== "Success") return [];
+		const found = [];
+		for (const [name, entry] of Object.entries(decoded.value.mcpServers ?? {})) {
+			const registration = registrationFromClaudeEntry(name, entry);
+			if (registration !== void 0) found.push(registration);
+		}
+		return found;
+	});
+	const readAt = (filePath) => filePath.pipe(Effect.flatMap((resolved) => readEntries(resolved)), Effect.provide(services), Effect.catchCause((cause) => Effect.logWarning("claude mcp config read failed", { cause }).pipe(Effect.as([]))));
+	/**
+	* Read, change the one key, write back atomically.
+	*
+	* A file that exists but will not parse fails the write loudly instead of
+	* being replaced with `{ mcpServers }`: whatever is in it — including a
+	* `~/.claude.json` full of the CLI's own state — is worth more than the
+	* edit. A missing file starts from empty, which is how `.mcp.json` is born.
+	*/
+	const changeFile = Effect.fn("ClaudeMcpFiles.changeFile")(function* (filePath, change) {
+		const raw = yield* fileSystem.readFileString(filePath).pipe(Effect.orElseSucceed(() => void 0), Effect.provide(services));
+		const decoded = raw === void 0 ? void 0 : decodeConfigFile(raw);
+		if (decoded !== void 0 && decoded._tag !== "Success") return yield* new McpRegistryError({ detail: `${filePath} exists but could not be parsed, so it was left alone.` });
+		const root = decoded === void 0 ? {} : decoded.value;
+		const nextServers = change({ ...root.mcpServers });
+		yield* fileSystem.makeDirectory(path.dirname(filePath), { recursive: true }).pipe(Effect.ignore, Effect.provide(services));
+		yield* writeFileStringAtomically({
+			filePath,
+			contents: `${encodeConfigFile({
+				...root,
+				mcpServers: nextServers
+			})}\n`
+		}).pipe(Effect.provide(services), Effect.mapError(() => new McpRegistryError({ detail: `Could not write ${filePath}.` })));
+	});
+	const projectFile = (projectDir) => path.join(path.resolve(projectDir), PROJECT_MCP_FILENAME);
+	const upsertAt = (filePath) => Effect.fn("ClaudeMcpFiles.upsertAt")(function* (registration) {
+		const resolved = yield* filePath.pipe(Effect.provide(services));
+		yield* changeFile(resolved, (entries) => ({
+			...entries,
+			[registration.name]: claudeEntryFromRegistration(registration)
+		}));
+	});
+	const removeAt = (filePath) => Effect.fn("ClaudeMcpFiles.removeAt")(function* (name) {
+		const resolved = yield* filePath.pipe(Effect.provide(services));
+		yield* changeFile(resolved, (entries) => {
+			const { [name]: _removed, ...rest } = entries;
+			return rest;
+		});
+	});
+	const userPath = claudeUserConfigPath();
+	return {
+		readUser: readAt(userPath),
+		upsertUser: (registration) => upsertAt(userPath)(registration),
+		removeUser: (name) => removeAt(userPath)(name),
+		readProject: (projectDir) => readAt(Effect.succeed(projectFile(projectDir))),
+		upsertProject: (projectDir, registration) => upsertAt(Effect.succeed(projectFile(projectDir)))(registration),
+		removeProject: (projectDir, name) => removeAt(Effect.succeed(projectFile(projectDir)))(name)
+	};
+});
+const layer$59 = Layer.effect(ClaudeMcpFiles, make$64);
+Layer.succeed(ClaudeMcpFiles, {
+	readUser: Effect.succeed([]),
+	upsertUser: () => Effect.fail(new McpRegistryError({ detail: "No Claude config in tests." })),
+	removeUser: () => Effect.fail(new McpRegistryError({ detail: "No Claude config in tests." })),
+	readProject: () => Effect.succeed([]),
+	upsertProject: () => Effect.fail(new McpRegistryError({ detail: "No Claude config in tests." })),
+	removeProject: () => Effect.fail(new McpRegistryError({ detail: "No Claude config in tests." }))
+});
+//#endregion
 //#region src/mcp/McpOAuth.ts
 /**
 * OAuth sign-in for remote MCP servers, per the MCP authorization spec.
@@ -15978,6 +16240,7 @@ const make$62 = Effect.gen(function* () {
 	const config = yield* ServerConfig$1;
 	const secrets = yield* ServerSecretStore;
 	const oauth = yield* McpOAuth;
+	const claudeFiles = yield* ClaudeMcpFiles;
 	const fileSystem = yield* FileSystem.FileSystem;
 	const path = yield* Path.Path;
 	const services = yield* Effect.context();
@@ -16026,7 +16289,21 @@ const make$62 = Effect.gen(function* () {
 				registration,
 				missingSecrets,
 				ready: registration.enabled && missingSecrets.length === 0 && !needsSignIn,
-				...Option.isSome(oauthStatus) ? { oauth: oauthStatus.value } : {}
+				...Option.isSome(oauthStatus) ? { oauth: oauthStatus.value } : {},
+				source: "registry"
+			});
+		}
+		const registryNames = new Set(statuses.map((status) => status.registration.name));
+		for (const userScope of yield* claudeFiles.readUser) {
+			if (registryNames.has(userScope.name)) continue;
+			const oauthStatus = userScope.transport === "stdio" ? Option.none() : yield* oauth.statusFor(userScope);
+			const needsSignIn = Option.isSome(oauthStatus) && !oauthStatus.value.connected;
+			statuses.push({
+				registration: userScope,
+				missingSecrets: [],
+				ready: !needsSignIn,
+				...Option.isSome(oauthStatus) ? { oauth: oauthStatus.value } : {},
+				source: "claude"
 			});
 		}
 		return statuses;
@@ -16092,6 +16369,20 @@ const make$62 = Effect.gen(function* () {
 					headers
 				};
 			}
+			for (const userScope of yield* claudeFiles.readUser) {
+				if (userScope.transport === "stdio") continue;
+				if (userScope.name in resolved) continue;
+				const token = yield* oauth.accessTokenFor(userScope);
+				if (Option.isNone(token)) continue;
+				resolved[userScope.name] = {
+					type: userScope.transport,
+					url: userScope.url,
+					headers: {
+						...userScope.headers,
+						Authorization: `Bearer ${token.value}`
+					}
+				};
+			}
 			return resolved;
 		}).pipe(Effect.provide(services), Effect.catchCause((cause) => Effect.logWarning("mcp registry resolve failed", { cause }).pipe(Effect.as({}))))
 	};
@@ -17813,7 +18104,7 @@ const make$59 = Effect.gen(function* () {
 const layer$54 = Layer.effect(AssetSync, make$59);
 //#endregion
 //#region src/cli/assets.ts
-const SyncServicesLive = layer$54.pipe(Layer.provideMerge(layer$55), Layer.provideMerge(layer$56), Layer.provideMerge(layer$59.pipe(Layer.provide(layer$66))), Layer.provideMerge(layer$66), Layer.provideMerge(FetchHttpClient.layer));
+const SyncServicesLive = layer$54.pipe(Layer.provideMerge(layer$55), Layer.provideMerge(layer$56), Layer.provideMerge(layer$60.pipe(Layer.provide(layer$67))), Layer.provideMerge(layer$67), Layer.provideMerge(FetchHttpClient.layer));
 const runWithSync = (flags, run) => Effect.gen(function* () {
 	const config = yield* resolveCliAuthConfig(flags, yield* GlobalFlag.LogLevel);
 	return yield* Effect.gen(function* () {
@@ -17821,7 +18112,7 @@ const runWithSync = (flags, run) => Effect.gen(function* () {
 			sync: yield* AssetSync,
 			link: yield* HubLink
 		});
-	}).pipe(Effect.provide(SyncServicesLive.pipe(Layer.provide(layer$69(config)), Layer.provide(Layer.succeed(References.MinimumLogLevel, "Error")))));
+	}).pipe(Effect.provide(SyncServicesLive.pipe(Layer.provide(layer$70(config)), Layer.provide(Layer.succeed(References.MinimumLogLevel, "Error")))));
 });
 const STATE_LABEL = {
 	synced: "synced",
@@ -28407,7 +28698,7 @@ const runProjectMutation = Effect.fn("runProjectMutation")(function* (flags, run
 			});
 			yield* Console.log(output);
 		}));
-		const offlineRuntimeLayer = ProjectCliRuntimeLive.pipe(Layer.provide(layer$69(config)), Layer.provide(Layer.succeed(References.MinimumLogLevel, minimumLogLevel)));
+		const offlineRuntimeLayer = ProjectCliRuntimeLive.pipe(Layer.provide(layer$70(config)), Layer.provide(Layer.succeed(References.MinimumLogLevel, minimumLogLevel)));
 		return yield* Effect.gen(function* () {
 			const snapshot = yield* getOfflineSnapshot();
 			const orchestrationEngine = yield* OrchestrationEngineService;
@@ -28418,7 +28709,7 @@ const runProjectMutation = Effect.fn("runProjectMutation")(function* (flags, run
 			});
 			yield* Console.log(output);
 		}).pipe(Effect.provide(offlineRuntimeLayer));
-	}).pipe(Effect.provide(Layer.mergeAll(runtimeLayer, layer$43).pipe(Layer.provideMerge(FetchHttpClient.layer), Layer.provide(layer$69(config)), Layer.provide(Layer.succeed(References.MinimumLogLevel, minimumLogLevel)))));
+	}).pipe(Effect.provide(Layer.mergeAll(runtimeLayer, layer$43).pipe(Layer.provideMerge(FetchHttpClient.layer), Layer.provide(layer$70(config)), Layer.provide(Layer.succeed(References.MinimumLogLevel, minimumLogLevel)))));
 });
 const projectAddCommand = Command.make("add", {
 	...projectLocationFlags,
@@ -44046,6 +44337,22 @@ function toAuthAccessStreamEvent(change, revision, currentSessionId) {
 		};
 	}
 }
+/**
+* Route one MCP write to the store its `source` names.
+*
+* `claude` and `project` write the CLI's own files; `registry` (or absent,
+* which every older client sends) writes p4code's store. A project write
+* without a directory is a caller bug worth a loud answer, not a fallback.
+*/
+const routeMcpWrite = (input, handlers) => {
+	if (input.source === "claude") return handlers.claude();
+	if (input.source === "project") {
+		const dir = input.projectDir?.trim() ?? "";
+		if (dir.length === 0) return Effect.fail(new McpRegistryError({ detail: "A project-scope write needs its project directory." }));
+		return handlers.project(dir);
+	}
+	return handlers.registry();
+};
 const makeWsRpcLayer = (currentSession, previewAutomationBroker) => WsRpcGroup.toLayer(Effect.gen(function* () {
 	const currentSessionId = currentSession.sessionId;
 	const crypto = yield* Crypto.Crypto;
@@ -44074,7 +44381,26 @@ const makeWsRpcLayer = (currentSession, previewAutomationBroker) => WsRpcGroup.t
 	const assetSync = yield* AssetSync;
 	const mcpRegistry = yield* McpRegistry;
 	const mcpOAuth = yield* McpOAuth;
+	const claudeMcpFiles = yield* ClaudeMcpFiles;
 	const skillRegistry = yield* SkillRegistry;
+	const listMcpServersEverywhere = Effect.gen(function* () {
+		const servers = [...yield* mcpRegistry.list];
+		const projectRows = yield* projectionProjects.listAll().pipe(Effect.map((rows) => rows.filter((row) => row.deletedAt === null)), Effect.orElseSucceed(() => []));
+		for (const project of projectRows) for (const registration of yield* claudeMcpFiles.readProject(project.workspaceRoot)) servers.push({
+			registration,
+			missingSecrets: [],
+			ready: true,
+			source: "project",
+			projectDir: project.workspaceRoot
+		});
+		return {
+			servers,
+			projects: projectRows.map((project) => ({
+				dir: project.workspaceRoot,
+				title: project.title
+			}))
+		};
+	});
 	const startup = yield* ServerRuntimeStartup;
 	const workspaceEntries = yield* WorkspaceEntries;
 	const workspaceFileSystem = yield* WorkspaceFileSystem;
@@ -44667,21 +44993,35 @@ const makeWsRpcLayer = (currentSession, previewAutomationBroker) => WsRpcGroup.t
 		}), { "rpc.aggregate": "skills" }),
 		[WS_METHODS.skillRegistrySearch]: ({ query }) => observeRpcEffect$1(WS_METHODS.skillRegistrySearch, skillRegistry.search(query), { "rpc.aggregate": "skills" }),
 		[WS_METHODS.skillRegistryFetch]: ({ id }) => observeRpcEffect$1(WS_METHODS.skillRegistryFetch, skillRegistry.fetch(id), { "rpc.aggregate": "skills" }),
-		[WS_METHODS.mcpList]: (_input) => observeRpcEffect$1(WS_METHODS.mcpList, mcpRegistry.list.pipe(Effect.map((servers) => ({ servers }))), { "rpc.aggregate": "mcp" }),
-		[WS_METHODS.mcpSave]: ({ registration }) => observeRpcEffect$1(WS_METHODS.mcpSave, mcpRegistry.save(registration).pipe(Effect.andThen(mcpRegistry.list.pipe(Effect.map((servers) => ({ servers }))))), { "rpc.aggregate": "mcp" }),
-		[WS_METHODS.mcpRemove]: ({ name }) => observeRpcEffect$1(WS_METHODS.mcpRemove, mcpRegistry.remove(name).pipe(Effect.andThen(mcpRegistry.list.pipe(Effect.map((servers) => ({ servers }))))), { "rpc.aggregate": "mcp" }),
+		[WS_METHODS.mcpList]: (_input) => observeRpcEffect$1(WS_METHODS.mcpList, listMcpServersEverywhere, { "rpc.aggregate": "mcp" }),
+		[WS_METHODS.mcpSave]: ({ registration, source, projectDir }) => observeRpcEffect$1(WS_METHODS.mcpSave, routeMcpWrite({
+			source,
+			projectDir
+		}, {
+			claude: () => claudeMcpFiles.upsertUser(registration),
+			project: (dir) => claudeMcpFiles.upsertProject(dir, registration),
+			registry: () => mcpRegistry.save(registration)
+		}).pipe(Effect.andThen(listMcpServersEverywhere)), { "rpc.aggregate": "mcp" }),
+		[WS_METHODS.mcpRemove]: ({ name, source, projectDir }) => observeRpcEffect$1(WS_METHODS.mcpRemove, routeMcpWrite({
+			source,
+			projectDir
+		}, {
+			claude: () => claudeMcpFiles.removeUser(name),
+			project: (dir) => claudeMcpFiles.removeProject(dir, name),
+			registry: () => mcpRegistry.remove(name)
+		}).pipe(Effect.andThen(listMcpServersEverywhere)), { "rpc.aggregate": "mcp" }),
 		[WS_METHODS.mcpSetSecret]: ({ name, slot, value }) => observeRpcEffect$1(WS_METHODS.mcpSetSecret, mcpRegistry.setSecret({
 			name,
 			slot,
 			value
-		}).pipe(Effect.andThen(mcpRegistry.list.pipe(Effect.map((servers) => ({ servers }))))), { "rpc.aggregate": "mcp" }),
+		}).pipe(Effect.andThen(listMcpServersEverywhere)), { "rpc.aggregate": "mcp" }),
 		[WS_METHODS.mcpOAuthBegin]: ({ name }) => observeRpcEffect$1(WS_METHODS.mcpOAuthBegin, Effect.gen(function* () {
 			const found = (yield* mcpRegistry.list).find((status) => status.registration.name === name);
 			if (found === void 0) return yield* new McpRegistryError({ detail: `No server is named ${name}.` });
 			if (found.registration.transport === "stdio") return yield* new McpRegistryError({ detail: "A stdio server is launched locally and has no sign-in." });
 			return yield* mcpOAuth.begin(found.registration);
 		}), { "rpc.aggregate": "mcp" }),
-		[WS_METHODS.mcpOAuthDisconnect]: ({ name }) => observeRpcEffect$1(WS_METHODS.mcpOAuthDisconnect, mcpOAuth.disconnect(name).pipe(Effect.andThen(mcpRegistry.list.pipe(Effect.map((servers) => ({ servers }))))), { "rpc.aggregate": "mcp" }),
+		[WS_METHODS.mcpOAuthDisconnect]: ({ name }) => observeRpcEffect$1(WS_METHODS.mcpOAuthDisconnect, mcpOAuth.disconnect(name).pipe(Effect.andThen(listMcpServersEverywhere)), { "rpc.aggregate": "mcp" }),
 		[WS_METHODS.serverGetSettings]: (_input) => observeRpcEffect$1(WS_METHODS.serverGetSettings, serverSettings.getSettings.pipe(Effect.map(redactServerSettingsForClient)), { "rpc.aggregate": "server" }),
 		[WS_METHODS.serverUpdateSettings]: ({ patch }) => observeRpcEffect$1(WS_METHODS.serverUpdateSettings, serverSettings.updateSettings(patch).pipe(Effect.map(redactServerSettingsForClient)), { "rpc.aggregate": "server" }),
 		[WS_METHODS.serverDiscoverSourceControl]: (_input) => observeRpcEffect$1(WS_METHODS.serverDiscoverSourceControl, sourceControlDiscovery.discover, { "rpc.aggregate": "server" }),
@@ -47179,7 +47519,7 @@ const makeOpenCodeRuntime = Effect.gen(function* () {
 	};
 });
 var OpenCodeRuntime = class extends Context.Service()("@p4code/cli/provider/opencodeRuntime") {};
-const OpenCodeRuntimeLive = Layer.effect(OpenCodeRuntime, makeOpenCodeRuntime).pipe(Layer.provide(layer$70));
+const OpenCodeRuntimeLive = Layer.effect(OpenCodeRuntime, makeOpenCodeRuntime).pipe(Layer.provide(layer$71));
 //#endregion
 //#region src/textGeneration/TextGenerationUtils.ts
 const isTextGenerationError$2 = Schema$1.is(TextGenerationError);
@@ -50582,7 +50922,9 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (claudeSettin
 					payload: {
 						taskId: RuntimeTaskId.make(message.task_id),
 						description: message.description,
-						...message.task_type ? { taskType: message.task_type } : {}
+						...message.task_type ? { taskType: message.task_type } : {},
+						...message.tool_use_id ? { toolUseId: message.tool_use_id } : {},
+						...message.subagent_type ? { subagentType: message.subagent_type } : {}
 					}
 				});
 				return;
@@ -50599,7 +50941,9 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (claudeSettin
 						description: message.description,
 						...message.summary ? { summary: message.summary } : {},
 						...message.usage ? { usage: message.usage } : {},
-						...message.last_tool_name ? { lastToolName: message.last_tool_name } : {}
+						...message.last_tool_name ? { lastToolName: message.last_tool_name } : {},
+						...message.tool_use_id ? { toolUseId: message.tool_use_id } : {},
+						...message.subagent_type ? { subagentType: message.subagent_type } : {}
 					}
 				});
 				return;
@@ -50616,7 +50960,8 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (claudeSettin
 						taskId: RuntimeTaskId.make(message.task_id),
 						status: message.status,
 						...message.summary ? { summary: message.summary } : {},
-						...message.usage ? { usage: message.usage } : {}
+						...message.usage ? { usage: message.usage } : {},
+						...message.tool_use_id ? { toolUseId: message.tool_use_id } : {}
 					}
 				});
 				return;
@@ -83838,7 +84183,9 @@ function runtimeEventToActivities(event, taskTitle) {
 			payload: {
 				taskId: event.payload.taskId,
 				...event.payload.taskType ? { taskType: event.payload.taskType } : {},
-				...event.payload.description ? { detail: truncateDetail(event.payload.description) } : {}
+				...event.payload.description ? { detail: truncateDetail(event.payload.description) } : {},
+				...event.payload.toolUseId ? { toolUseId: event.payload.toolUseId } : {},
+				...event.payload.subagentType ? { subagentType: event.payload.subagentType } : {}
 			},
 			turnId: toTurnId$1(event.turnId) ?? null,
 			...maybeSequence
@@ -83855,7 +84202,9 @@ function runtimeEventToActivities(event, taskTitle) {
 				detail: truncateDetail(event.payload.summary ?? event.payload.description),
 				...event.payload.summary ? { summary: truncateDetail(event.payload.summary) } : {},
 				...event.payload.lastToolName ? { lastToolName: event.payload.lastToolName } : {},
-				...event.payload.usage !== void 0 ? { usage: event.payload.usage } : {}
+				...event.payload.usage !== void 0 ? { usage: event.payload.usage } : {},
+				...event.payload.toolUseId ? { toolUseId: event.payload.toolUseId } : {},
+				...event.payload.subagentType ? { subagentType: event.payload.subagentType } : {}
 			},
 			turnId: toTurnId$1(event.turnId) ?? null,
 			...maybeSequence
@@ -83874,7 +84223,8 @@ function runtimeEventToActivities(event, taskTitle) {
 					summary: truncateDetail(event.payload.summary),
 					detail: truncateDetail(event.payload.summary)
 				} : {},
-				...event.payload.usage !== void 0 ? { usage: event.payload.usage } : {}
+				...event.payload.usage !== void 0 ? { usage: event.payload.usage } : {},
+				...event.payload.toolUseId ? { toolUseId: event.payload.toolUseId } : {}
 			},
 			turnId: toTurnId$1(event.turnId) ?? null,
 			...maybeSequence
@@ -86464,9 +86814,9 @@ const WorkspaceEntriesLayerLive = layer$25.pipe(Layer.provide(layer$43));
 const WorkspaceFileSystemLayerLive = layer$24.pipe(Layer.provide(layer$43), Layer.provide(WorkspaceEntriesLayerLive));
 const WorkspaceLayerLive = Layer.mergeAll(layer$43, WorkspaceEntriesLayerLive, WorkspaceFileSystemLayerLive);
 const ProjectFaviconResolverLayerLive = layer$41.pipe(Layer.provide(layer$43), Layer.provide(layer$42));
-const AuthLayerLive = layer$62.pipe(Layer.provideMerge(PersistenceLayerLive), Layer.provide(layer$66));
+const AuthLayerLive = layer$63.pipe(Layer.provideMerge(PersistenceLayerLive), Layer.provide(layer$67));
 const ProviderRuntimeLayerLive = ProviderSessionReaperLive.pipe(Layer.provideMerge(ProviderLayerLive), Layer.provideMerge(OrchestrationLayerLive));
-const RuntimeDependenciesLive = ReactorLayerLive.pipe(Layer.provideMerge(CheckpointingLayerLive), Layer.provideMerge(SourceControlProviderRegistryLayerLive), Layer.provideMerge(GitLayerLive), Layer.provideMerge(VcsLayerLive), Layer.provideMerge(ProviderRuntimeLayerLive), Layer.provideMerge(Layer.mergeAll(TerminalLayerLive, PreviewLayerLive)), Layer.provideMerge(PersistenceLayerLive), Layer.provideMerge(layer$51), Layer.provideMerge(ProviderRegistryLive), Layer.provideMerge(ProviderInstanceRegistryHydrationLive), Layer.provideMerge(ProviderEventLoggersLive), Layer.provideMerge(OpenCodeRuntimeLive), Layer.provideMerge(layer$59.pipe(Layer.provide(layer$66))), Layer.provideMerge(WorkspaceLayerLive), Layer.provideMerge(ProjectFaviconResolverLayerLive), Layer.provideMerge(layer$52), Layer.provideMerge(layer$45), Layer.provideMerge(AuthLayerLive), Layer.provideMerge(Layer.mergeAll(layer$57, layer$31).pipe(Layer.provideMerge(layer$58))), Layer.provideMerge(layer$66)).pipe(Layer.provideMerge(layer$8), Layer.provideMerge(layer$7), Layer.provideMerge(layer$6), Layer.provideMerge(layer$48), Layer.provideMerge(layer$50), Layer.provideMerge(layer$49), Layer.provide(layer$70));
+const RuntimeDependenciesLive = ReactorLayerLive.pipe(Layer.provideMerge(CheckpointingLayerLive), Layer.provideMerge(SourceControlProviderRegistryLayerLive), Layer.provideMerge(GitLayerLive), Layer.provideMerge(VcsLayerLive), Layer.provideMerge(ProviderRuntimeLayerLive), Layer.provideMerge(Layer.mergeAll(TerminalLayerLive, PreviewLayerLive)), Layer.provideMerge(PersistenceLayerLive), Layer.provideMerge(layer$51), Layer.provideMerge(ProviderRegistryLive), Layer.provideMerge(ProviderInstanceRegistryHydrationLive), Layer.provideMerge(ProviderEventLoggersLive), Layer.provideMerge(OpenCodeRuntimeLive), Layer.provideMerge(layer$60.pipe(Layer.provide(layer$67))), Layer.provideMerge(WorkspaceLayerLive), Layer.provideMerge(ProjectFaviconResolverLayerLive), Layer.provideMerge(layer$52), Layer.provideMerge(layer$45), Layer.provideMerge(AuthLayerLive), Layer.provideMerge(Layer.mergeAll(layer$57, layer$31).pipe(Layer.provideMerge(layer$58), Layer.provideMerge(layer$59))), Layer.provideMerge(layer$67)).pipe(Layer.provideMerge(layer$8), Layer.provideMerge(layer$7), Layer.provideMerge(layer$6), Layer.provideMerge(layer$48), Layer.provideMerge(layer$50), Layer.provideMerge(layer$49), Layer.provide(layer$71));
 /**
 * Hub asset sync.
 *
@@ -86886,7 +87236,7 @@ const serviceCommand = Command.make("service").pipe(Command.withDescription("Man
 ]));
 //#endregion
 //#region src/bin.ts
-const CliRuntimeLayer = Layer.mergeAll(NodeServices.layer, layer$70, FetchHttpClient.layer);
+const CliRuntimeLayer = Layer.mergeAll(NodeServices.layer, layer$71, FetchHttpClient.layer);
 /**
 * Prints an update reminder before dispatching, at most once a day.
 *