priiisk 0.1.8 → 0.1.9

package/dist/{chunk-BXVX5A4M.js → chunk-EHPEGFN2.js}

@@ -86,8 +86,8 @@ import {
   selectCampRun,
   styleCampUiTone,
   uniqueCampUiNames
-} from "./chunk-S7LCWMQY.js";
-import "./chunk-TZBPOE6G.js";
+} from "./chunk-NIJ2J45R.js";
+import "./chunk-F7LGUL2J.js";
 export {
   CAMP_UI_BASH_PREVIEW_LINES,
   CAMP_UI_DEFAULT_TOOL_PREVIEW_LINES,

package/dist/{chunk-TZBPOE6G.js → chunk-F7LGUL2J.js}

@@ -43163,25 +43163,9 @@ var rollbackOrFail = (rollback, workerId) => Effect_exports.exit(rollback).pipe(
     )
   )
 );
-var requestOnCurrentBase = (request2, current2) => {
-  if (request2.role !== void 0 || request2.preset !== void 0) return request2;
-  const overrides = {
-    ...request2.overrides,
-    ...request2.overrides?.model === void 0 && current2.model !== void 0 ? { model: current2.model } : {},
-    ...request2.overrides?.thinkingLevel === void 0 && current2.thinkingLevel !== void 0 ? { thinkingLevel: current2.thinkingLevel } : {}
-  };
-  return {
-    ...request2,
-    ...current2.role === void 0 ? {} : { role: current2.role },
-    ...current2.preset === void 0 ? {} : { preset: current2.preset },
-    overrides
-  };
-};
-var updateWorkerEquipment = (runtime6, command, identity6, request2) => Effect_exports.gen(function* () {
+var updateWorkerEquipment = (runtime6, command, identity6, change) => Effect_exports.gen(function* () {
   const [initial, sessionRef] = yield* requireKernelSession(runtime6, identity6);
-  const equipment = yield* runtime6.equipmentResolver.resolve(
-    requestOnCurrentBase(request2, initial.equipment)
-  );
+  const equipment = yield* runtime6.equipmentResolver.reresolve(initial.equipment, change);
   const resource = yield* getWorkerResource(runtime6, initial.id);
   if (resource === void 0) {
     return yield* Effect_exports.fail(

package/dist/{chunk-FZQM7AKO.js → chunk-GEBZQLE7.js}

@@ -20,7 +20,7 @@ import {
   layerNet,
   makeCampSurfaceName,
   resolveProjectScopeSync
-} from "./chunk-W2ZL6LWM.js";
+} from "./chunk-LH753BUY.js";
 import {
   Clock_exports,
   Config_exports,
@@ -38,7 +38,7 @@ import {
   Schedule_exports,
   Schema_exports,
   Stream_exports
-} from "./chunk-TZBPOE6G.js";
+} from "./chunk-F7LGUL2J.js";
 
 // packages/cli/src/doctor/doctorModel.ts
 var DOCTOR_REPORT_SCHEMA_VERSION = 1;
@@ -112,7 +112,7 @@ var CliSurfaceSelectionError = class extends Data_exports.TaggedError("CliSurfac
 import { randomUUID } from "node:crypto";
 
 // packages/cli/src/domain/cliVersion.ts
-var PRIIISK_CLI_VERSION = "0.1.8";
+var PRIIISK_CLI_VERSION = "0.1.9";
 
 // packages/cli/src/client/campRpcConnection.ts
 var reportRetry = (options, diagnostic) => options.onRetry === void 0 ? Console_exports.error(

package/dist/{chunk-4V3HXXQ6.js → chunk-IORSBZKU.js}

@@ -28,7 +28,7 @@ import {
   makePlatform,
   makeRunMain,
   stdin
-} from "./chunk-W2ZL6LWM.js";
+} from "./chunk-LH753BUY.js";
 import {
   BaseProto,
   __export,
@@ -112,7 +112,7 @@ import {
   write,
   zip,
   zipRight
-} from "./chunk-TZBPOE6G.js";
+} from "./chunk-F7LGUL2J.js";
 
 // node_modules/.pnpm/@effect+platform-node@0.107.0_@effect+cluster@0.59.0_@effect+platform@0.96.2_effect@3.2_9535e05eb804fa0fb275ce283b448483/node_modules/@effect/platform-node/dist/esm/NodeContext.js
 var NodeContext_exports = {};

package/dist/{chunk-W2ZL6LWM.js → chunk-LH753BUY.js}

@@ -366,7 +366,7 @@ import {
   write,
   zipRight,
   zipRight2
-} from "./chunk-TZBPOE6G.js";
+} from "./chunk-F7LGUL2J.js";
 
 // node_modules/.pnpm/detect-libc@2.1.2/node_modules/detect-libc/lib/process.js
 var require_process = __commonJS({
@@ -10447,15 +10447,7 @@ var resolveNamedServers = (config, names) => {
   };
 };
 var resolveMcpServers = (config, role, mcpOverride) => resolveNamedServers(config, resolveServerNames(config, role, mcpOverride));
-var resolveCampMcpUnion = (config) => resolveNamedServers(
-  config,
-  Object.values(AgentRole).flatMap((role) => resolveServerNames(config, role, void 0))
-);
-var resolveCampMcpOutsideUnion = (config, mcpOverride) => {
-  if (mcpOverride === void 0) return [];
-  const allowed = new Set(Object.keys(resolveCampMcpUnion(config).servers));
-  return dedupe3(mcpOverride).filter((name) => !allowed.has(name));
-};
+var resolveCampMcpCatalog = (config) => resolveNamedServers(config, Object.keys(config?.mcpServers ?? {}));
 var applyCampMcpRuntimeDefaults = (servers) => {
   const codegraph = servers.codegraph;
   if (codegraph === void 0 || codegraph.lifecycle !== void 0) return servers;
@@ -10487,6 +10479,7 @@ var resolveNamedThinkingForAlias = (config, alias, namedLevel) => {
 var resolveDefaultPreset = (config) => ({
   modelAlias: config.defaults.model,
   modelId: resolveModelAlias(config, config.defaults.model),
+  abstractThinking: config.defaults.thinking,
   thinking: resolveThinkingForAlias(config, config.defaults.model, config.defaults.thinking)
 });
 var resolveModelAliasForRole = (config, role) => config.roles?.[role]?.model ?? config.defaults.model;
@@ -10499,6 +10492,7 @@ var resolveRolePreset = (config, role) => {
     description: config.roles?.[role]?.description,
     modelAlias,
     modelId: resolveModelAlias(config, modelAlias),
+    abstractThinking,
     thinking: resolveThinkingForAlias(config, modelAlias, abstractThinking),
     readOnly: config.roles?.[role]?.readOnly,
     directTools: config.roles?.[role]?.directTools
@@ -10523,6 +10517,7 @@ var resolveHirePreset = (config, presetName) => {
       role: entry.role,
       modelAlias,
       modelId,
+      abstractThinking,
       thinking,
       readOnly: entry.readOnly ?? (entry.role !== void 0 ? config.roles?.[entry.role]?.readOnly : void 0),
       directTools: entry.directTools ?? (entry.role !== void 0 ? config.roles?.[entry.role]?.directTools : void 0)
@@ -10677,8 +10672,8 @@ var parseDirectToolSandboxStatus = (status) => {
 var describeDirectToolSandbox = (sandbox2) => sandbox2.kind === DirectToolSandboxKind.bubblewrap ? "External binaries run in a bubblewrap sandbox: read-only filesystem, writable worker directory, no network" : sandbox2.absence === DirectToolSandboxAbsence.disabled ? `External binaries run without an OS sandbox: disabled by ${DIRECT_TOOL_SANDBOX_ENV}` : sandbox2.absence === DirectToolSandboxAbsence.unsupportedPlatform ? `External binaries run without an OS sandbox: no supported mechanism on ${sandbox2.detail ?? "this platform"}` : sandbox2.absence === DirectToolSandboxAbsence.binaryMissing ? "External binaries run without an OS sandbox: bubblewrap (bwrap) is not installed" : "External binaries run without an OS sandbox: bubblewrap is present but cannot start";
 
 // packages/protocol/src/domain/protocolVersion.ts
-var PRIIISK_PROTOCOL_VERSION = "11";
-var PRIIISK_PROTOCOL_PACKAGE_VERSION = "0.1.8";
+var PRIIISK_PROTOCOL_VERSION = "12";
+var PRIIISK_PROTOCOL_PACKAGE_VERSION = "0.1.9";
 var ProtocolVersionSchema = Schema_exports.String.pipe(Schema_exports.minLength(1));
 
 // packages/protocol/src/domain/protocolIdentifiers.ts
@@ -10939,6 +10934,21 @@ var EquipmentRequestSchema = Schema_exports.Struct({
     })
   )
 });
+var EquipmentChangeSchema = Schema_exports.Struct({
+  builtinTools: Schema_exports.optional(StringList),
+  customToolNames: Schema_exports.optional(StringList),
+  directTools: Schema_exports.optional(Schema_exports.Union(Schema_exports.Boolean, StringList)),
+  skillNames: Schema_exports.optional(StringList),
+  skillPaths: Schema_exports.optional(StringList),
+  mcp: Schema_exports.optional(
+    Schema_exports.Struct({
+      serverNames: StringList,
+      toolNamesByServer: Schema_exports.optional(
+        Schema_exports.Record({ key: NonEmptyString5, value: Schema_exports.Array(NonEmptyString5) })
+      )
+    })
+  )
+});
 
 // packages/protocol/src/domain/eventDtos.ts
 var CampEventKindSchema = Schema_exports.Literal(
@@ -13418,12 +13428,16 @@ var CampProtocol = class extends RpcGroup_exports.make(
     success: WorkerSummarySchema,
     error: CampOperationErrorSchema
   }),
-  /** Re-equips a live worker; the answer carries the committed equipment revision. */
+  /**
+   * Changes the grant of a live worker; the answer carries the committed
+   * equipment revision. The identity it was hired with is not part of the
+   * payload: changing that means hiring another worker.
+   */
   Rpc_exports.make("Equip", {
     payload: {
       ...CommandContextSchema.fields,
       worker: WorkerSelectorSchema,
-      equipment: EquipmentRequestSchema
+      equipment: EquipmentChangeSchema
     },
     success: WorkerSummarySchema,
     error: CampOperationErrorSchema
@@ -13553,7 +13567,7 @@ var CampProtocol = class extends RpcGroup_exports.make(
 };
 
 // packages/camp-state/src/bootstrap/campHostVersion.ts
-var PRIIISK_HOST_VERSION = "0.1.8";
+var PRIIISK_HOST_VERSION = "0.1.9";
 
 // packages/surface/src/domain/surfaceModel.ts
 var NonEmptyString7 = Schema_exports.String.pipe(Schema_exports.minLength(1));
@@ -14926,11 +14940,11 @@ export {
   directToolBin,
   resolveDirectTools,
   resolveMcpServers,
-  resolveCampMcpUnion,
-  resolveCampMcpOutsideUnion,
+  resolveCampMcpCatalog,
   applyCampMcpRuntimeDefaults,
   resolveMcpSecretEnv,
   resolveModelAlias,
+  resolveThinkingForAlias,
   resolveNamedThinkingForAlias,
   resolveDefaultPreset,
   resolveRolePreset,

package/dist/{chunk-S7LCWMQY.js → chunk-NIJ2J45R.js}

@@ -12,7 +12,7 @@ import {
   Match_exports,
   Stream_exports,
   SubscriptionRef_exports
-} from "./chunk-TZBPOE6G.js";
+} from "./chunk-F7LGUL2J.js";
 
 // packages/host-ui/src/backend/campUiBackend.ts
 var CampUiBackendError = class extends Data_exports.TaggedError("CampUiBackendError") {

package/dist/{chunk-OWFOOE7W.js → chunk-QEUSNJ3D.js}

@@ -3,7 +3,7 @@ const require = __priiiskCreateRequire(import.meta.url);
 import {
   FileSystem_exports,
   PRIIISK_PI_AGENT_DIR_ENV
-} from "./chunk-W2ZL6LWM.js";
+} from "./chunk-LH753BUY.js";
 import {
   CampDeliveryPort,
   CampFailureCode,
@@ -30,7 +30,7 @@ import {
   __require,
   __toESM,
   campScopeClosedReason
-} from "./chunk-TZBPOE6G.js";
+} from "./chunk-F7LGUL2J.js";
 
 // node_modules/.pnpm/undici@7.28.0/node_modules/undici/lib/core/symbols.js
 var require_symbols = __commonJS({

package/dist/{chunk-TGTG65RZ.js → chunk-QQBVNDLC.js}

@@ -8,13 +8,13 @@ import {
   makeDoctorReport,
   resolveCampSurface,
   withCampRpc
-} from "./chunk-FZQM7AKO.js";
+} from "./chunk-GEBZQLE7.js";
 import {
   PI_RUNTIME_VERSION,
   PiModelCatalogIssueCode,
   inspectPiModelCatalog,
   makePiOperatorResources
-} from "./chunk-OWFOOE7W.js";
+} from "./chunk-QEUSNJ3D.js";
 import {
   CampHealthComponentStatus,
   CampHealthOverallStatus,
@@ -48,13 +48,13 @@ import {
   resolveCredentialsPath,
   resolveProjectScope,
   resolveWorkerConfigPath
-} from "./chunk-W2ZL6LWM.js";
+} from "./chunk-LH753BUY.js";
 import {
   Clock_exports,
   Effect_exports,
   Option_exports,
   Ref_exports
-} from "./chunk-TZBPOE6G.js";
+} from "./chunk-F7LGUL2J.js";
 
 // packages/cli/src/doctor/environmentDoctor.ts
 import { dirname } from "node:path";

package/dist/priiisk-host.js

@@ -4,14 +4,14 @@ const require = __priiiskCreateRequire(import.meta.url);
 import {
   NodeContext_exports,
   NodeRuntime_exports
-} from "./chunk-4V3HXXQ6.js";
+} from "./chunk-IORSBZKU.js";
 import {
   CampUiBackendError,
   CampUiHealthStatus,
   CampUiPlacement,
   CampUiRuntimeStatus,
   mountPiCampUi
-} from "./chunk-S7LCWMQY.js";
+} from "./chunk-NIJ2J45R.js";
 import {
   PiTransport,
   makePiOperatorResources,
@@ -19,7 +19,7 @@ import {
   makePiTransportLayer,
   requirePiModelCatalog,
   require_undici
-} from "./chunk-OWFOOE7W.js";
+} from "./chunk-QEUSNJ3D.js";
 import {
   AgentRole,
   AgentRoleSchema,
@@ -67,6 +67,7 @@ import {
   campRecoveryDiagnosticFromCause,
   campRunPaths,
   currentDirectToolSandbox,
+  directToolBin,
   directToolName,
   directToolSandboxCommand,
   findCampRecoveryHealthComponent,
@@ -81,8 +82,7 @@ import {
   prepareCampRunStorage,
   prepareCampStorage,
   projectScopeFromCwd,
-  resolveCampMcpOutsideUnion,
-  resolveCampMcpUnion,
+  resolveCampMcpCatalog,
   resolveDefaultPreset,
   resolveDirectTools,
   resolveExecutablePath,
@@ -96,11 +96,12 @@ import {
   resolveRolePreset,
   resolveRoleProfilePath,
   resolveSkillGroups,
+  resolveThinkingForAlias,
   resolveWorkerSkillsRoot,
   runningCampManifest,
   saveCampHealth,
   saveCampManifest
-} from "./chunk-W2ZL6LWM.js";
+} from "./chunk-LH753BUY.js";
 import {
   CampAskRouter,
   CampCancellationCode,
@@ -193,7 +194,7 @@ import {
   withFiberRuntime,
   workerAliasIdentity,
   workerIdIdentity
-} from "./chunk-TZBPOE6G.js";
+} from "./chunk-F7LGUL2J.js";
 
 // node_modules/.pnpm/ws@8.21.1/node_modules/ws/lib/constants.js
 var require_constants = __commonJS({
@@ -11463,6 +11464,19 @@ var equipmentRequestFromDto = (request) => ({
     }
   }
 });
+var equipmentChangeFromDto = (change) => ({
+  ...change.builtinTools === void 0 ? {} : { builtinTools: change.builtinTools },
+  ...change.customToolNames === void 0 ? {} : { customToolNames: change.customToolNames },
+  ...change.directTools === void 0 ? {} : { directTools: change.directTools },
+  ...change.skillNames === void 0 ? {} : { skillNames: change.skillNames },
+  ...change.skillPaths === void 0 ? {} : { skillPaths: change.skillPaths },
+  ...change.mcp === void 0 ? {} : {
+    mcp: {
+      serverNames: change.mcp.serverNames,
+      ...change.mcp.toolNamesByServer === void 0 ? {} : { toolNamesByServer: change.mcp.toolNamesByServer }
+    }
+  }
+});
 var transcriptContentDto = (content) => {
   if (content.kind === "text") return { kind: "text", text: content.text };
   if (content.kind === "thinking") {
@@ -22437,7 +22451,7 @@ var Client = class extends Protocol {
 };
 
 // packages/mcp-backend/src/connections/clientIdentity.ts
-var backendVersion = "0.1.8";
+var backendVersion = "0.1.9";
 
 // packages/mcp-backend/src/connections/mcpFailure.ts
 var McpFailure = class extends Data_exports.TaggedError("McpFailure") {
@@ -25117,7 +25131,7 @@ var configLoadError = (path) => new CampMcpError({
 });
 var acquireMcpHubBackendForConfig = (config2) => Effect_exports.gen(function* () {
   const fs = yield* FileSystem_exports.FileSystem;
-  const resolution = resolveCampMcpUnion(config2);
+  const resolution = resolveCampMcpCatalog(config2);
   const servers = applyCampMcpRuntimeDefaults(resolution.servers);
   const credentials = yield* loadReferencedMcpCredentials(fs, resolution.referencedEnvNames).pipe(
     Effect_exports.mapError((cause) => configLoadError(cause.path))
@@ -25218,7 +25232,12 @@ var selectModel = (config2, requested, sources) => {
 };
 var selectThinking = (config2, requested, alias, sources) => {
   if (requested === void 0) {
-    return Effect_exports.succeed(sources.find((source) => source?.thinking !== void 0)?.thinking);
+    const abstract = sources.find(
+      (source) => source?.abstractThinking !== void 0
+    )?.abstractThinking;
+    return Effect_exports.succeed(
+      abstract === void 0 || config2 === void 0 || alias === void 0 ? abstract : resolveThinkingForAlias(config2, alias, abstract) ?? abstract
+    );
   }
   if (!Schema_exports.is(PiThinkingLevelSchema)(requested)) {
     return Effect_exports.fail(equipmentError("unknown_thinking_level", { thinkingLevel: requested }));
@@ -25254,8 +25273,18 @@ var makeHostToolRegistry = (options) => ({
 });
 
 // packages/host/src/equipment/configEquipmentResolver.ts
-var makeConfigEquipmentResolver = (fs, path, config2, registry2 = makeHostToolRegistry()) => ({
-  resolve: (request) => Effect_exports.gen(function* () {
+var carriedTools = (current) => {
+  const bins = [];
+  const customToolNames = [];
+  for (const name of current.customToolNames) {
+    const bin = directToolBin(name);
+    if (bin === void 0) customToolNames.push(name);
+    else bins.push(bin);
+  }
+  return { bins, customToolNames };
+};
+var makeConfigEquipmentResolver = (fs, path, config2, registry2 = makeHostToolRegistry()) => {
+  const resolve = (request) => Effect_exports.gen(function* () {
     const presetResolution = request.preset === void 0 ? void 0 : config2 === void 0 ? { found: false, reason: "not-found" } : resolveHirePreset(config2, request.preset);
     if (presetResolution !== void 0 && !presetResolution.found) {
       return yield* Effect_exports.fail(
@@ -25304,19 +25333,18 @@ var makeConfigEquipmentResolver = (fs, path, config2, registry2 = makeHostToolRe
         equipmentError("unknown_skill_groups", { groups: skillResolution.unknownGroups })
       );
     }
-    const namedSkills = [...request.overrides?.skillNames ?? skillResolution.skillNames];
+    const requestedSkillNames = request.overrides?.skillNames;
+    const requestedSkillPaths = request.overrides?.skillPaths;
+    const namedSkills = requestedSkillNames ?? (requestedSkillPaths === void 0 ? skillResolution.skillNames : []);
     const skillPaths = [
-      ...request.overrides?.skillPaths ?? namedSkills.map((name) => path.join(resolveWorkerSkillsRoot(), name))
+      .../* @__PURE__ */ new Set([
+        ...namedSkills.map((name) => path.join(resolveWorkerSkillsRoot(), name)),
+        ...requestedSkillPaths ?? []
+      ])
     ];
     const skillNames = skillPaths.map((skillPath) => path.basename(skillPath, ".md"));
     yield* requirePaths(fs, skillPaths);
     const requestedMcp = request.overrides?.mcp;
-    const outsideUnion = resolveCampMcpOutsideUnion(config2, requestedMcp?.serverNames);
-    if (outsideUnion.length > 0) {
-      return yield* Effect_exports.fail(
-        equipmentError("mcp_outside_camp_catalog", { servers: outsideUnion })
-      );
-    }
     const mcpResolution = resolveMcpServers(config2, role, requestedMcp?.serverNames);
     if (mcpResolution.unknownServers.length > 0) {
       return yield* Effect_exports.fail(
@@ -25355,8 +25383,40 @@ var makeConfigEquipmentResolver = (fs, path, config2, registry2 = makeHostToolRe
       },
       ...request.overrides?.executionLimits === void 0 ? {} : { executionLimits: request.overrides.executionLimits }
     };
-  })
-});
+  });
+  return {
+    resolve,
+    /*
+     * The identity of a live worker travels unchanged, and every category the
+     * change stays silent about keeps what the worker already carries. Rebuilding
+     * the untouched ones from the role turned a single `--skill` into a silent
+     * revoke of the servers and binaries the worker had been given at hire.
+     */
+    reresolve: (current, change) => {
+      const carried = carriedTools(current);
+      return resolve({
+        ...current.role === void 0 ? {} : { role: current.role },
+        ...current.preset === void 0 ? {} : { preset: current.preset },
+        overrides: {
+          ...current.model === void 0 ? {} : { model: current.model },
+          ...current.thinkingLevel === void 0 ? {} : { thinkingLevel: current.thinkingLevel },
+          readOnly: current.readOnly,
+          builtinTools: change.builtinTools ?? current.builtinTools,
+          customToolNames: change.customToolNames ?? carried.customToolNames,
+          directTools: change.directTools ?? carried.bins,
+          /*
+           * Paths decide the set, so an unchanged worker keeps its exact paths
+           * rather than names that would be re-resolved under the camp root.
+           */
+          ...change.skillNames === void 0 ? {} : { skillNames: change.skillNames },
+          ...change.skillNames === void 0 && change.skillPaths === void 0 ? { skillPaths: current.skillPaths } : change.skillPaths === void 0 ? {} : { skillPaths: change.skillPaths },
+          mcp: change.mcp ?? current.mcp,
+          ...current.executionLimits === void 0 ? {} : { executionLimits: current.executionLimits }
+        }
+      });
+    }
+  };
+};
 var ConfigEquipmentResolverLive = Layer_exports.effect(
   EquipmentResolver,
   Effect_exports.gen(function* () {
@@ -26151,7 +26211,7 @@ var makeWorkerEquipmentRpcHandlers = ({
         },
         operations.equip(commandContext(request), {
           worker: workerIdentityFromDto(request.worker),
-          equipment: equipmentRequestFromDto(request.equipment)
+          equipment: equipmentChangeFromDto(request.equipment)
         }).pipe(
           Effect_exports.map(workerDetailFromRecord),
           Effect_exports.mapError((error2) => failureFromHostOperation("equip", error2))
@@ -26489,6 +26549,8 @@ var directToolEnvironment = (source) => {
 
 // packages/host/src/tools/directTools.ts
 var DEFAULT_TIMEOUT_MS = 3e4;
+var TERMINATION_GRACE_MS = 2e3;
+var ABANDON_GRACE_MS = 2e3;
 var DEFAULT_MAX_OUTPUT_BYTES = 64 * 1024;
 var MAX_BUFFER_BYTES = 8 * 1024 * 1024;
 var truncate = (value, limit) => {
@@ -26525,8 +26587,15 @@ var runBinary = (executablePath, args, options, environment, signal) => {
     });
     let timedOut = false;
     let launchError;
+    let settled = false;
+    let killTimer;
+    let abandonTimer;
     const stop = () => {
       child.kill("SIGTERM");
+      killTimer ??= setTimeout(() => {
+        child.kill("SIGKILL");
+        abandonTimer = setTimeout(() => finish(void 0, "SIGKILL"), ABANDON_GRACE_MS);
+      }, TERMINATION_GRACE_MS);
     };
     const stdout = collect(child.stdout, stop);
     const stderr = collect(child.stderr, stop);
@@ -26538,18 +26607,18 @@ var runBinary = (executablePath, args, options, environment, signal) => {
       timedOut = true;
       stop();
     }, options.timeoutMs ?? DEFAULT_TIMEOUT_MS);
-    child.on("error", (cause) => {
-      if (signal?.aborted === true || cause.name === "AbortError") return;
-      launchError = `${cause.code ?? cause.name}: ${cause.message}`;
-    });
-    child.on("close", (code, terminatedBy) => {
+    const finish = (code, terminatedBy) => {
+      if (settled) return;
+      settled = true;
       clearTimeout(timer);
+      if (killTimer !== void 0) clearTimeout(killTimer);
+      if (abandonTimer !== void 0) clearTimeout(abandonTimer);
       const sandboxStatus = sandboxed ? parseDirectToolSandboxStatus(status.text()) : void 0;
       resolve({
         stdout: stdout.text(),
         stderr: stderr.text(),
         exitCode: sandboxStatus?.exitCode ?? code ?? void 0,
-        signal: terminatedBy ?? void 0,
+        signal: terminatedBy,
         timedOut,
         /*
          * A sandbox that never reached the command is only a refusal when the
@@ -26559,6 +26628,13 @@ var runBinary = (executablePath, args, options, environment, signal) => {
         ...sandboxStatus !== void 0 && !sandboxStatus.started && !timedOut && launchError === void 0 ? { sandboxFailed: true } : {},
         ...launchError === void 0 ? {} : { launchError }
       });
+    };
+    child.on("error", (cause) => {
+      if (signal?.aborted === true || cause.name === "AbortError") return;
+      launchError = `${cause.code ?? cause.name}: ${cause.message}`;
+    });
+    child.on("close", (code, terminatedBy) => {
+      finish(code, terminatedBy ?? void 0);
     });
   });
 };

package/dist/priiisk.js

@@ -5,7 +5,7 @@ import {
   fromReadable,
   layer,
   runMain
-} from "./chunk-4V3HXXQ6.js";
+} from "./chunk-IORSBZKU.js";
 import {
   CliCampLifecycleError,
   CliEquipmentConflict,
@@ -23,7 +23,7 @@ import {
   resolveCampSurface,
   withCampRpc,
   withCampRpcSession
-} from "./chunk-FZQM7AKO.js";
+} from "./chunk-GEBZQLE7.js";
 import {
   CampCommandFailure,
   CampHostReadiness,
@@ -58,7 +58,7 @@ import {
   resolveProjectScopeSync,
   saveCampManifest,
   startingCampManifest
-} from "./chunk-W2ZL6LWM.js";
+} from "./chunk-LH753BUY.js";
 import {
   Cause_exports,
   CommitPrototype,
@@ -239,7 +239,7 @@ import {
   zipLeft,
   zipRight,
   zipWith
-} from "./chunk-TZBPOE6G.js";
+} from "./chunk-F7LGUL2J.js";
 
 // node_modules/.pnpm/ini@4.1.3/node_modules/ini/lib/ini.js
 var require_ini = __commonJS({
@@ -19952,7 +19952,7 @@ var campResumeListCommand = Command_exports.make(
   )
 ).pipe(Command_exports.withDescription("Lists saved runs of this project that resume can restore."));
 var runIdArgument = Args_exports.text({ name: "runId" }).pipe(Args_exports.optional);
-var selectCampRunOnDemand = (items) => Effect_exports.promise(() => import("./chunk-BXVX5A4M.js")).pipe(
+var selectCampRunOnDemand = (items) => Effect_exports.promise(() => import("./chunk-EHPEGFN2.js")).pipe(
   Effect_exports.flatMap((ui) => ui.selectCampRun({ items }))
 );
 var selectAndResume = (json) => {
@@ -20025,7 +20025,7 @@ var rootCommand = Command_exports.make(
 ).pipe(Command_exports.withDescription("Runs and observes a camp of collaborating workers."));
 
 // packages/cli/src/commands/doctorCommand.ts
-var runDoctorOnDemand = Effect_exports.promise(() => import("./chunk-TGTG65RZ.js")).pipe(
+var runDoctorOnDemand = Effect_exports.promise(() => import("./chunk-QQBVNDLC.js")).pipe(
   Effect_exports.flatMap((doctor) => doctor.runDoctor)
 );
 var statusLabel = {
@@ -20209,6 +20209,48 @@ var equipmentRequest = (role, preset, overrides) => ({
   ...Option_exports.isSome(preset) ? { preset: preset.value } : {},
   ...overrides === void 0 ? {} : { overrides }
 });
+var equipmentChangeOptions = {
+  tools: toolOption,
+  customTools: customToolOption,
+  skills: skillOption,
+  skillPaths: skillPathOption,
+  directTools: directToolOption,
+  mcp: mcpOption,
+  mcpTools: mcpToolOption,
+  noTools: noToolsOption,
+  noCustomTools: noCustomToolsOption,
+  noSkills: noSkillsOption,
+  noDirectTools: noDirectToolsOption,
+  noMcp: noMcpOption
+};
+var resolveEquipmentChange = (operation, input) => {
+  const full = {
+    ...input,
+    model: Option_exports.none(),
+    thinking: Option_exports.none(),
+    access: Option_exports.none()
+  };
+  const categories = conflictingEquipmentCategories(full);
+  if (categories.length > 0) {
+    return Effect_exports.fail(
+      new CliEquipmentConflict({
+        operation,
+        code: "equipment_flag_conflict",
+        message: `granting and clearing the same equipment: ${categories.join(", ")}`,
+        categories
+      })
+    );
+  }
+  const overrides = equipmentOverrides(full) ?? {};
+  return Effect_exports.succeed({
+    ...overrides.builtinTools === void 0 ? {} : { builtinTools: overrides.builtinTools },
+    ...overrides.customToolNames === void 0 ? {} : { customToolNames: overrides.customToolNames },
+    ...overrides.directTools === void 0 ? {} : { directTools: overrides.directTools },
+    ...overrides.skillNames === void 0 ? {} : { skillNames: overrides.skillNames },
+    ...overrides.skillPaths === void 0 ? {} : { skillPaths: overrides.skillPaths },
+    ...overrides.mcp === void 0 ? {} : { mcp: overrides.mcp }
+  });
+};
 
 // packages/cli/src/commands/equipCommand.ts
 var equipCommand = Command_exports.make(
@@ -20216,20 +20258,18 @@ var equipCommand = Command_exports.make(
   {
     worker: workerArgument,
     byId: byIdOption,
-    role: roleOption,
-    preset: presetOption,
-    ...equipmentOptions,
+    ...equipmentChangeOptions,
     json: jsonOption
   },
-  ({ worker, byId, role, preset, json, ...equipment }) => resolveEquipmentOverrides("equip", equipment).pipe(
+  ({ worker, byId, json, ...equipment }) => resolveEquipmentChange("equip", equipment).pipe(
     Effect_exports.flatMap(
-      (overrides) => withCampRpc(
+      (change) => withCampRpc(
         ({ client, command: command2 }) => command2().pipe(
           Effect_exports.flatMap(
             (context) => client.Equip({
               ...context,
               worker: workerSelector(worker, byId),
-              equipment: equipmentRequest(role, preset, overrides)
+              equipment: change
             })
           )
         ),
@@ -20239,7 +20279,9 @@ var equipCommand = Command_exports.make(
     printValue(json, formatWorker)
   )
 ).pipe(
-  Command_exports.withDescription("Changes the equipment of a live worker without recreating its session.")
+  Command_exports.withDescription(
+    "Hands a live worker skills, MCP servers, binaries and tools, or takes them back."
+  )
 );
 
 // packages/cli/src/client/campStartupFlow.ts
@@ -20735,7 +20777,7 @@ var command = rootCommand.pipe(
 );
 var cli = Command_exports.run(command, {
   name: "priiisk camp control",
-  version: "0.1.8"
+  version: "0.1.9"
 });
 var runCliCommand = (argumentsList) => cli(argumentsList).pipe(
   Effect_exports.matchEffect({

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "priiisk",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "CLI for running and observing a camp of collaborating agents",
   "type": "module",
   "bin": {
     "priiisk": "./dist/priiisk.js"
   },
   "files": [
-    "dist/chunk-4V3HXXQ6.js",
-    "dist/chunk-BXVX5A4M.js",
-    "dist/chunk-FZQM7AKO.js",
-    "dist/chunk-OWFOOE7W.js",
-    "dist/chunk-OWFOOE7W.js.LEGAL.txt",
-    "dist/chunk-S7LCWMQY.js",
-    "dist/chunk-TGTG65RZ.js",
-    "dist/chunk-TZBPOE6G.js",
-    "dist/chunk-W2ZL6LWM.js",
-    "dist/chunk-W2ZL6LWM.js.LEGAL.txt",
+    "dist/chunk-EHPEGFN2.js",
+    "dist/chunk-F7LGUL2J.js",
+    "dist/chunk-GEBZQLE7.js",
+    "dist/chunk-IORSBZKU.js",
+    "dist/chunk-LH753BUY.js",
+    "dist/chunk-LH753BUY.js.LEGAL.txt",
+    "dist/chunk-NIJ2J45R.js",
+    "dist/chunk-QEUSNJ3D.js",
+    "dist/chunk-QEUSNJ3D.js.LEGAL.txt",
+    "dist/chunk-QQBVNDLC.js",
     "dist/priiisk-host.js",
     "dist/priiisk.js",
     "profiles",