priiisk 0.1.7 → 0.1.9

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

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

package/dist/{chunk-3V5SHVCX.js → chunk-F7LGUL2J.js}

@@ -41892,6 +41892,15 @@ var CampWorkerInterrupted = class extends Data_exports.TaggedError("CampWorkerIn
 };
 var CampWorkerTerminated = class extends Data_exports.TaggedError("CampWorkerTerminated") {
 };
+var campTurnFailureReason = (outcome) => {
+  if (outcome.stopReason !== CampTurnStopReason.error && outcome.failureCode === void 0) {
+    return void 0;
+  }
+  return {
+    code: outcome.failureCode === void 0 ? CampFailureCode.unknown : CampFailureCode.providerError,
+    message: outcome.errorMessage ?? "turn ended with an error"
+  };
+};
 
 // packages/kernel/src/domain/campTopology.ts
 var CampChildClosePolicy = { cascade: "cascade", detach: "detach" };
@@ -43154,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(
@@ -43396,9 +43389,11 @@ var handleSessionEvent = (runtime6, id3, event) => Effect_exports.gen(function*
         );
         return { kind: "retrying", worker: worker2, payload: event.payload };
       }
+      const turnError = event.kind === CampSessionEventKind.turnCompleted ? campTurnFailureReason(event.payload.outcome) : void 0;
       const worker = yield* runtime6.registry.updateTimestamps(id3, {
         updatedAt,
-        lastActivityAt: updatedAt
+        lastActivityAt: updatedAt,
+        ...event.kind === CampSessionEventKind.turnCompleted ? { turnError: turnError ?? null } : {}
       });
       if (event.kind === CampSessionEventKind.activity) {
         return { kind: "activity", worker, payload: event.payload };
@@ -43910,13 +43905,15 @@ var makeRegistryLifecycleOperations = (stateRef) => ({
     if (isTerminalCampState(record4.state) || record4.state === CampWorkerState.interrupted) {
       return mutationFailure(registryInvalid("registry.updateTimestamps", { id: id3 }), state);
     }
+    const carried = input.turnError === null ? Object.fromEntries(Object.entries(record4).filter(([key]) => key !== "error")) : record4;
     const next4 = {
-      ...record4,
+      ...carried,
       updatedAt: input.updatedAt,
       version: record4.version + 1,
       ...input.admittedAt === void 0 ? {} : { admittedAt: input.admittedAt },
       ...input.startedAt === void 0 ? {} : { startedAt: input.startedAt },
-      ...input.lastActivityAt === void 0 ? {} : { lastActivityAt: input.lastActivityAt }
+      ...input.lastActivityAt === void 0 ? {} : { lastActivityAt: input.lastActivityAt },
+      ...input.turnError === void 0 || input.turnError === null ? {} : { error: input.turnError }
     };
     return mutationSuccess(next4, {
       ...state,

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

@@ -20,10 +20,11 @@ import {
   layerNet,
   makeCampSurfaceName,
   resolveProjectScopeSync
-} from "./chunk-JND6HOSJ.js";
+} from "./chunk-LH753BUY.js";
 import {
   Clock_exports,
   Config_exports,
+  Console_exports,
   Context_exports,
   Data_exports,
   Deferred_exports,
@@ -37,7 +38,7 @@ import {
   Schedule_exports,
   Schema_exports,
   Stream_exports
-} from "./chunk-3V5SHVCX.js";
+} from "./chunk-F7LGUL2J.js";
 
 // packages/cli/src/doctor/doctorModel.ts
 var DOCTOR_REPORT_SCHEMA_VERSION = 1;
@@ -111,9 +112,12 @@ 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.7";
+var PRIIISK_CLI_VERSION = "0.1.9";
 
 // packages/cli/src/client/campRpcConnection.ts
+var reportRetry = (options, diagnostic) => options.onRetry === void 0 ? Console_exports.error(
+  `[retry] ${diagnostic.operation}: \u043F\u043E\u043F\u044B\u0442\u043A\u0430 ${String(diagnostic.attempt)}, \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0430\u044F \u0432 ${String(diagnostic.nextRetryAt)} \u2014 ${diagnostic.message}`
+).pipe(Effect_exports.ignore) : options.onRetry(diagnostic);
 var PRIIISK_CONTROLLER_ID_ENV = "PRIIISK_CONTROLLER_ID";
 var PRIIISK_CONSUMER_ID_ENV = "PRIIISK_CONSUMER_ID";
 var protocolRetrySchedule = Schedule_exports.exponential("50 millis").pipe(
@@ -151,12 +155,12 @@ var makeCampProtocolLayer = (socketPath, options) => Effect_exports.gen(function
         Effect_exports.flatMap(
           ({ attempt, cause }) => Clock_exports.currentTimeMillis.pipe(
             Effect_exports.flatMap(
-              (now) => options.onRetry?.({
+              (now) => reportRetry(options, {
                 operation: options.operation,
                 attempt,
                 nextRetryAt: now + 50 * 2 ** (attempt - 1),
                 message: cause instanceof Error ? cause.message : String(cause)
-              }) ?? Effect_exports.void
+              })
             )
           )
         )

package/dist/{chunk-7U7PROSV.js → chunk-IORSBZKU.js}

@@ -28,7 +28,7 @@ import {
   makePlatform,
   makeRunMain,
   stdin
-} from "./chunk-JND6HOSJ.js";
+} from "./chunk-LH753BUY.js";
 import {
   BaseProto,
   __export,
@@ -112,7 +112,7 @@ import {
   write,
   zip,
   zipRight
-} from "./chunk-3V5SHVCX.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-JND6HOSJ.js → chunk-LH753BUY.js}

@@ -366,7 +366,7 @@ import {
   write,
   zipRight,
   zipRight2
-} from "./chunk-3V5SHVCX.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.7";
+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.7";
+var PRIIISK_HOST_VERSION = "0.1.9";
 
 // packages/surface/src/domain/surfaceModel.ts
 var NonEmptyString7 = Schema_exports.String.pipe(Schema_exports.minLength(1));
@@ -14497,12 +14511,27 @@ var CampRunCatalogErrorCode = {
   notFound: "run_not_found",
   notResumable: "run_not_resumable",
   persistenceFailed: "persistence_failed",
+  /**
+   * Checkpoint написан другой версией схемы. Общий `persistence_failed` описывал
+   * бы это как поломку хранилища, тогда как лечение другое и уже названо в
+   * контракте recovery: свежий запуск либо обновление рантайма
+   * (priiisk-nss.6.23).
+   */
+  checkpointUnsupported: "checkpoint_unsupported",
   scopeMismatch: "scope_mismatch"
 };
 var CampRunCatalogError = class extends Data_exports.TaggedError("CampRunCatalogError") {
 };
 var isCampRunResumable = (manifest) => manifest.workers.some((worker) => worker.session.lifecycle !== "pending");
 
+// packages/camp-state/src/history/campRunCatalogFailures.ts
+var manifestReadFailure = (operation, message, cause) => new CampRunCatalogError({
+  operation,
+  code: cause instanceof CampManifestVersionError ? CampRunCatalogErrorCode.checkpointUnsupported : CampRunCatalogErrorCode.persistenceFailed,
+  message,
+  ...cause === void 0 ? {} : { cause }
+});
+
 // packages/camp-state/src/history/campRunCatalog.ts
 var catalogError = (operation, code, message, cause) => new CampRunCatalogError({
   operation,
@@ -14527,12 +14556,7 @@ var summary = (manifest, active) => ({
 });
 var loadRequired = (fs, path, operation) => loadCampManifest(fs, path).pipe(
   Effect_exports.mapError(
-    (cause) => catalogError(
-      operation,
-      CampRunCatalogErrorCode.persistenceFailed,
-      `\u043D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043F\u0440\u043E\u0447\u0438\u0442\u0430\u0442\u044C camp run: ${path}`,
-      cause
-    )
+    (cause) => manifestReadFailure(operation, `\u043D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043F\u0440\u043E\u0447\u0438\u0442\u0430\u0442\u044C camp run: ${path}`, cause)
   ),
   Effect_exports.flatMap(
     Option_exports.match({
@@ -14556,12 +14580,7 @@ var pathExists = (fs, path, operation) => fs.exists(path).pipe(
 var listCampRuns = (fs, project, paths) => Effect_exports.gen(function* () {
   const active = yield* loadCampManifest(fs, paths.manifestPath).pipe(
     Effect_exports.mapError(
-      (cause) => catalogError(
-        "list",
-        CampRunCatalogErrorCode.persistenceFailed,
-        "\u043D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043F\u0440\u043E\u0447\u0438\u0442\u0430\u0442\u044C active camp run",
-        cause
-      )
+      (cause) => manifestReadFailure("list", "\u043D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043F\u0440\u043E\u0447\u0438\u0442\u0430\u0442\u044C active camp run", cause)
     )
   );
   if (Option_exports.isSome(active)) yield* validateScope("list", project, active.value);
@@ -14921,11 +14940,11 @@ export {
   directToolBin,
   resolveDirectTools,
   resolveMcpServers,
-  resolveCampMcpUnion,
-  resolveCampMcpOutsideUnion,
+  resolveCampMcpCatalog,
   applyCampMcpRuntimeDefaults,
   resolveMcpSecretEnv,
   resolveModelAlias,
+  resolveThinkingForAlias,
   resolveNamedThinkingForAlias,
   resolveDefaultPreset,
   resolveRolePreset,

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

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

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

@@ -3,7 +3,7 @@ const require = __priiiskCreateRequire(import.meta.url);
 import {
   FileSystem_exports,
   PRIIISK_PI_AGENT_DIR_ENV
-} from "./chunk-JND6HOSJ.js";
+} from "./chunk-LH753BUY.js";
 import {
   CampDeliveryPort,
   CampFailureCode,
@@ -30,7 +30,7 @@ import {
   __require,
   __toESM,
   campScopeClosedReason
-} from "./chunk-3V5SHVCX.js";
+} from "./chunk-F7LGUL2J.js";
 
 // node_modules/.pnpm/undici@7.28.0/node_modules/undici/lib/core/symbols.js
 var require_symbols = __commonJS({
@@ -26557,14 +26557,30 @@ var makePiSessionRuntime = (options) => Effect_exports.gen(function* () {
     /*
      * Aborting ends the turn, not the session: the terminal signal stays
      * untouched, so the worker survives its interruption and the next
-     * message starts a new turn. Committing the cycle first keeps the late
-     * agent_end/agent_settled of the abandoned turn from settling it.
+     * message starts a new turn. The cycle is committed first, because the
+     * late agent_end/agent_settled of the abandoned turn must not settle it.
+     *
+     * An adapter that refuses the abort leaves the turn running, so the
+     * commit is rolled back: otherwise the worker would keep working while
+     * its own settled events were ignored as belonging to a finished cycle
+     * (priiisk-nss.6.27).
      */
     abort: (sessionRef) => requireLive(sessionRef, PiSessionOperation.abort).pipe(
       Effect_exports.flatMap(
-        (live) => commitCurrentCycle(live).pipe(
-          Effect_exports.zipRight(
-            run(live, PiSessionOperation.abort, () => live.runtime.session.abort())
+        (live) => Ref_exports.get(live.lifecycle).pipe(
+          Effect_exports.flatMap(
+            (before) => commitCurrentCycle(live).pipe(
+              Effect_exports.zipRight(
+                run(live, PiSessionOperation.abort, () => live.runtime.session.abort())
+              ),
+              Effect_exports.tapError(
+                () => Ref_exports.update(live.lifecycle, (state) => ({
+                  cycle: state.cycle,
+                  providerAttempts: state.providerAttempts,
+                  ...before.committedCycle === void 0 ? {} : { committedCycle: before.committedCycle }
+                }))
+              )
+            )
           )
         )
       )

package/dist/{chunk-4VQ2KUN7.js → chunk-QQBVNDLC.js}

@@ -8,13 +8,13 @@ import {
   makeDoctorReport,
   resolveCampSurface,
   withCampRpc
-} from "./chunk-ZUREJQA6.js";
+} from "./chunk-GEBZQLE7.js";
 import {
   PI_RUNTIME_VERSION,
   PiModelCatalogIssueCode,
   inspectPiModelCatalog,
   makePiOperatorResources
-} from "./chunk-WEYE43UO.js";
+} from "./chunk-QEUSNJ3D.js";
 import {
   CampHealthComponentStatus,
   CampHealthOverallStatus,
@@ -48,13 +48,13 @@ import {
   resolveCredentialsPath,
   resolveProjectScope,
   resolveWorkerConfigPath
-} from "./chunk-JND6HOSJ.js";
+} from "./chunk-LH753BUY.js";
 import {
   Clock_exports,
   Effect_exports,
   Option_exports,
   Ref_exports
-} from "./chunk-3V5SHVCX.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-7U7PROSV.js";
+} from "./chunk-IORSBZKU.js";
 import {
   CampUiBackendError,
   CampUiHealthStatus,
   CampUiPlacement,
   CampUiRuntimeStatus,
   mountPiCampUi
-} from "./chunk-YOW4MMBD.js";
+} from "./chunk-NIJ2J45R.js";
 import {
   PiTransport,
   makePiOperatorResources,
@@ -19,7 +19,7 @@ import {
   makePiTransportLayer,
   requirePiModelCatalog,
   require_undici
-} from "./chunk-WEYE43UO.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-JND6HOSJ.js";
+} from "./chunk-LH753BUY.js";
 import {
   CampAskRouter,
   CampCancellationCode,
@@ -193,7 +194,7 @@ import {
   withFiberRuntime,
   workerAliasIdentity,
   workerIdIdentity
-} from "./chunk-3V5SHVCX.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") {
@@ -12788,23 +12802,38 @@ var stableJson = (value) => {
   const entries = Object.entries(value).filter(([, entry]) => entry !== void 0).sort(([left], [right]) => left.localeCompare(right));
   return `{${entries.map(([key, entry]) => `${JSON.stringify(key)}:${stableJson(entry)}`).join(",")}}`;
 };
+var durableFailureSummary = (cause) => {
+  const code = cause?.code;
+  if (typeof code === "string" && code !== "") return code;
+  const name = cause instanceof Error ? cause.name : void 0;
+  return name === void 0 || name === "" ? "unknown" : name;
+};
 var receiptPersistenceFailure = (operation, cause) => new CampCommandFailure({
   operation,
   code: CampReceiptFailureCode.persistenceFailed,
-  message: `command receipt could not be made durable: ${String(cause)}`,
-  retryable: true
+  message: `command receipt could not be made durable (${durableFailureSummary(cause)})`,
+  retryable: true,
+  recoveryAction: "manual_recovery"
 });
 var loadCampReceipts = (fs, path, runId) => fs.exists(path).pipe(
   Effect_exports.flatMap((exists) => exists ? fs.readFileString(path) : Effect_exports.succeed(void 0)),
   Effect_exports.flatMap(
-    (contents) => contents === void 0 ? Effect_exports.succeed([]) : Effect_exports.try(() => JSON.parse(contents)).pipe(
+    (contents) => contents === void 0 ? Effect_exports.succeed({ receipts: [] }) : Effect_exports.try(() => JSON.parse(contents)).pipe(
       Effect_exports.flatMap(decodeState),
       Effect_exports.map(
-        (state) => state.schemaVersion === CAMP_RECEIPT_SCHEMA_VERSION && state.runId === runId ? state.receipts : []
+        (state) => state.schemaVersion === CAMP_RECEIPT_SCHEMA_VERSION && state.runId === runId ? { receipts: state.receipts } : {
+          receipts: [],
+          unreadable: state.runId === runId ? "unsupported_schema_version" : "foreign_run"
+        }
+      ),
+      Effect_exports.catchAll(
+        () => Effect_exports.succeed({ receipts: [], unreadable: "corrupt" })
       )
     )
   ),
-  Effect_exports.catchAll(() => Effect_exports.succeed([]))
+  Effect_exports.catchAll(
+    () => Effect_exports.succeed({ receipts: [], unreadable: "unreadable" })
+  )
 );
 var saveCampReceipts = (fs, path, runId, receipts) => {
   const temporaryPath = `${path}.${randomUUID2()}.tmp`;
@@ -12888,9 +12917,15 @@ var makeCampCommandReceiptStoreLayer = (options) => Layer_exports.scoped(
     const retentionMillis = (options.retentionSeconds ?? CAMP_RECEIPT_DEFAULT_RETENTION_SECONDS) * 1e3;
     const restoredAt = yield* Clock_exports.currentTimeMillis;
     const restored = yield* loadCampReceipts(fs, options.statePath, journal.runId);
-    const state = yield* Ref_exports.make(campReceiptStateFromRecords(restored, restoredAt));
+    const state = yield* Ref_exports.make(campReceiptStateFromRecords(restored.receipts, restoredAt));
     const inFlight = yield* Ref_exports.make(/* @__PURE__ */ new Map());
-    const lastFailure = yield* Ref_exports.make(void 0);
+    const lastFailure = yield* Ref_exports.make(
+      restored.unreadable === void 0 ? void 0 : receiptFailure(
+        "restore",
+        CampReceiptFailureCode.unreadable,
+        `durable command receipts were not restored (${restored.unreadable})`
+      )
+    );
     const changes = yield* PubSub_exports.sliding(1);
     const lane = yield* Effect_exports.makeSemaphore(1);
     const publish = PubSub_exports.publish(changes, void 0).pipe(Effect_exports.asVoid);
@@ -22416,7 +22451,7 @@ var Client = class extends Protocol {
 };
 
 // packages/mcp-backend/src/connections/clientIdentity.ts
-var backendVersion = "0.1.7";
+var backendVersion = "0.1.9";
 
 // packages/mcp-backend/src/connections/mcpFailure.ts
 var McpFailure = class extends Data_exports.TaggedError("McpFailure") {
@@ -25096,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))
@@ -25197,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 }));
@@ -25233,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(
@@ -25283,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(
@@ -25334,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* () {
@@ -25399,6 +25480,7 @@ var readSegmentText = (fs, path) => fs.readFileString(path).pipe(
 var loadJournalSegment = (fs, path, expected) => readSegmentText(fs, path).pipe(
   Effect_exports.flatMap((text) => {
     const totalBytes = Buffer.byteLength(text, "utf8");
+    const endsWithNewline = text.endsWith("\n");
     const lines = text.split("\n");
     if (lines[lines.length - 1] === "") lines.pop();
     const headerLine = lines[0];
@@ -25408,7 +25490,8 @@ var loadJournalSegment = (fs, path, expected) => readSegmentText(fs, path).pipe(
         firstCursor: expected.firstCursor,
         events: [],
         validBytes: 0,
-        totalBytes
+        totalBytes,
+        truncatedTail: false
       });
     }
     const headerJson = parseJson(headerLine);
@@ -25419,7 +25502,9 @@ var loadJournalSegment = (fs, path, expected) => readSegmentText(fs, path).pipe(
         firstCursor: expected.firstCursor,
         events: [],
         validBytes: 0,
-        totalBytes
+        totalBytes,
+        /* Заголовок целиком записан, но нечитаем: это повреждение, не обрыв. */
+        truncatedTail: lines.length === 1 && !endsWithNewline
       });
     }
     if (header.right.schemaVersion > CAMP_JOURNAL_SCHEMA_VERSION) {
@@ -25454,12 +25539,19 @@ var loadJournalSegment = (fs, path, expected) => readSegmentText(fs, path).pipe(
     }
     const events = [];
     let validBytes = lineBytes(headerLine);
+    let stoppedAt;
     for (let index = 1; index < lines.length; index += 1) {
       const line = lines[index] ?? "";
       const parsed = parseJson(line);
       const decoded = parsed === void 0 ? void 0 : decodeEvent(parsed);
-      if (decoded === void 0 || Either_exports.isLeft(decoded)) break;
-      if (decoded.right.cursor !== expected.firstCursor + events.length) break;
+      if (decoded === void 0 || Either_exports.isLeft(decoded)) {
+        stoppedAt = index;
+        break;
+      }
+      if (decoded.right.cursor !== expected.firstCursor + events.length) {
+        stoppedAt = index;
+        break;
+      }
       events.push(decoded.right);
       validBytes += lineBytes(line);
     }
@@ -25468,7 +25560,14 @@ var loadJournalSegment = (fs, path, expected) => readSegmentText(fs, path).pipe(
       firstCursor: expected.firstCursor,
       events,
       validBytes,
-      totalBytes
+      totalBytes,
+      /*
+       * Обрезать можно только оборванную последнюю запись: она одна осталась
+       * после валидного префикса и не завершена переводом строки. Если после
+       * сбойной записи есть другие или сама она дописана до конца, это
+       * повреждение внутри файла, и обрезка стерла бы durable историю.
+       */
+      truncatedTail: stoppedAt === lines.length - 1 && !endsWithNewline
     });
   })
 );
@@ -25552,6 +25651,16 @@ var restoreCampJournal = (fs, options) => Effect_exports.gen(function* () {
           )
         );
       }
+      if (!loaded.truncatedTail) {
+        return yield* Effect_exports.fail(
+          campJournalError(
+            "open",
+            CampJournalErrorCode.corrupted,
+            "journal segment is damaged inside its last segment",
+            { path }
+          )
+        );
+      }
       yield* truncateSegment(fs, path, loaded.validBytes);
     }
     if (loaded.validBytes === 0) {
@@ -25683,10 +25792,9 @@ var makeCampJournalWriter = (fs, options, restored) => Effect_exports.gen(functi
       const event = CampEventDtoSchema.make({ ...draft, cursor });
       yield* writeLine(active.segment, journalEventLine(event));
       yield* SubscriptionRef_exports.update(state, (latest) => {
-        const { lastFailure: _lastFailure, ...healthy } = latest;
         const records = (active.segments[active.segments.length - 1]?.records ?? 0) + 1;
         return {
-          ...healthy,
+          ...latest,
           segments: withRecords(active.segments, records),
           latestCursor: cursor
         };
@@ -26103,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))
@@ -26259,13 +26367,26 @@ var CampRpcHandlersLive = CampProtocol.toLayer(
           )
         )
       ),
+      /*
+       * Interrupt is a mutating command like the rest, so it goes through the
+       * receipt: a repeat of the same `commandId` answers with the recorded
+       * result instead of aborting a turn twice, and a stale generation is
+       * refused before the side effect (priiisk-nss.6.24).
+       */
       Interrupt: (request) => validateReady(request).pipe(
         Effect_exports.zipRight(
-          operations.interrupt(commandContext(request), workerIdentityFromDto(request.worker))
-        ),
-        Effect_exports.as({ accepted: true }),
-        Effect_exports.mapError(
-          (error2) => error2 instanceof ProtocolVersionMismatch || error2 instanceof ProjectScopeMismatch ? error2 : failureFromKernel("interrupt", error2)
+          receipts.run(
+            {
+              identity: commandIdentity(request),
+              operation: "interrupt",
+              payload: { worker: request.worker },
+              schema: CampAckSchema
+            },
+            operations.interrupt(commandContext(request), workerIdentityFromDto(request.worker)).pipe(
+              Effect_exports.as(CampAckSchema.make({ accepted: true })),
+              Effect_exports.mapError((error2) => failureFromKernel("interrupt", error2))
+            )
+          )
         )
       ),
       OpenWorker: (request) => validateReady(request).pipe(
@@ -26428,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) => {
@@ -26464,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);
@@ -26477,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
@@ -26498,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);
     });
   });
 };
@@ -26721,6 +26858,26 @@ var acquireLiveCampHost = (options = {}) => Effect_exports.gen(function* () {
     piResources.modelRegistry,
     { authDiagnosticCodes: piResources.authDiagnosticCodes ?? [] }
   );
+  const reportStartupJournalFailure = (cause) => cause instanceof CampJournalError ? Clock_exports.currentTimeMillis.pipe(
+    Effect_exports.flatMap(
+      (now) => saveCampHealth(fs, paths.healthPath, {
+        ...initialCampHealthSnapshot(project.hash, "startup", now),
+        overallStatus: CampHealthOverallStatus.failed,
+        components: [
+          {
+            id: CAMP_JOURNAL_HEALTH_COMPONENT,
+            category: CampHealthComponentCategory.controller,
+            status: CampHealthComponentStatus.failed,
+            code: cause.code,
+            operation: "controller.journal.open",
+            message: cause.message,
+            updatedAt: now
+          }
+        ]
+      })
+    ),
+    Effect_exports.ignore
+  ) : Effect_exports.void;
   const context = yield* Layer_exports.build(
     makeLiveCampHostLayer({
       project,
@@ -26740,7 +26897,7 @@ var acquireLiveCampHost = (options = {}) => Effect_exports.gen(function* () {
         receiptsPath: campRunPaths(paths, options.manifestRunId).receiptsPath
       }
     })
-  );
+  ).pipe(Effect_exports.tapError(reportStartupJournalFailure));
   const kernel = Context_exports.get(context, CampKernel);
   const asks = Context_exports.get(context, CampAskRouter);
   const health = Context_exports.get(context, CampHostHealth);

package/dist/priiisk.js

@@ -5,7 +5,7 @@ import {
   fromReadable,
   layer,
   runMain
-} from "./chunk-7U7PROSV.js";
+} from "./chunk-IORSBZKU.js";
 import {
   CliCampLifecycleError,
   CliEquipmentConflict,
@@ -23,7 +23,7 @@ import {
   resolveCampSurface,
   withCampRpc,
   withCampRpcSession
-} from "./chunk-ZUREJQA6.js";
+} from "./chunk-GEBZQLE7.js";
 import {
   CampCommandFailure,
   CampHostReadiness,
@@ -58,7 +58,7 @@ import {
   resolveProjectScopeSync,
   saveCampManifest,
   startingCampManifest
-} from "./chunk-JND6HOSJ.js";
+} from "./chunk-LH753BUY.js";
 import {
   Cause_exports,
   CommitPrototype,
@@ -239,7 +239,7 @@ import {
   zipLeft,
   zipRight,
   zipWith
-} from "./chunk-3V5SHVCX.js";
+} from "./chunk-F7LGUL2J.js";
 
 // node_modules/.pnpm/ini@4.1.3/node_modules/ini/lib/ini.js
 var require_ini = __commonJS({
@@ -18637,9 +18637,11 @@ var equipmentLines = (equipment, revision) => [
   `  mcp: ${mcpGrants(equipment.mcp)}`,
   `  skills: ${names([...equipment.skillNames])}`
 ];
+var WORKER_ERROR_LIMIT = 160;
 var formatWorker = (worker) => {
   const alias = worker.alias === void 0 ? "" : ` (${worker.alias})`;
-  const headline = `${worker.workerId}${alias}: ${worker.state}, session ${worker.sessionState}`;
+  const failure2 = worker.error === void 0 ? "" : ` \u2014 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0439 \u0445\u043E\u0434: ${worker.error.code}: ${worker.error.message.slice(0, WORKER_ERROR_LIMIT)}`;
+  const headline = `${worker.workerId}${alias}: ${worker.state}, session ${worker.sessionState}${failure2}`;
   return worker.equipment === void 0 ? headline : [headline, ...equipmentLines(worker.equipment, worker.equipmentVersion)].join("\n");
 };
 var printWorkers = (json) => (effect) => effect.pipe(
@@ -19094,7 +19096,9 @@ var resolveMessageText = (operation, text11, file6) => {
     );
   }
   if (Option_exports.isSome(file6)) return readMessageFile(operation, file6.value);
-  if (Option_exports.isSome(text11)) return Effect_exports.succeed(text11.value);
+  if (Option_exports.isSome(text11)) {
+    return text11.value.trim().length === 0 ? Effect_exports.fail(failure(operation, "message_empty", "\u0422\u0435\u043A\u0441\u0442 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044F \u043F\u0443\u0441\u0442")) : Effect_exports.succeed(text11.value);
+  }
   return Effect_exports.fail(
     failure(operation, "message_source_missing", "\u041D\u0443\u0436\u0435\u043D \u0442\u0435\u043A\u0441\u0442 \u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u043E\u043C \u043B\u0438\u0431\u043E --file <path>")
   );
@@ -19948,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-VLP2ZKVV.js")).pipe(
+var selectCampRunOnDemand = (items) => Effect_exports.promise(() => import("./chunk-EHPEGFN2.js")).pipe(
   Effect_exports.flatMap((ui) => ui.selectCampRun({ items }))
 );
 var selectAndResume = (json) => {
@@ -20021,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-4VQ2KUN7.js")).pipe(
+var runDoctorOnDemand = Effect_exports.promise(() => import("./chunk-QQBVNDLC.js")).pipe(
   Effect_exports.flatMap((doctor) => doctor.runDoctor)
 );
 var statusLabel = {
@@ -20205,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(
@@ -20212,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
             })
           )
         ),
@@ -20235,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
@@ -20359,7 +20405,19 @@ var eventsCommand = Command_exports.make(
         if (follow) {
           yield* stream.pipe(
             Stream_exports.runForEach(
-              (event) => Console_exports.log(json ? JSON.stringify(event) : formatCampEvent(event))
+              (event) => Console_exports.log(json ? JSON.stringify(event) : formatCampEvent(event)).pipe(
+                Effect_exports.zipRight(
+                  ack ? client.AckEvents({
+                    ...leaseRequest,
+                    generation: event.generation,
+                    cursor: event.cursor
+                  }).pipe(Effect_exports.asVoid) : Effect_exports.void
+                )
+              )
+            )
+          ).pipe(
+            Effect_exports.ensuring(
+              release ? client.ReleaseConsumer(context).pipe(Effect_exports.ignore) : Effect_exports.void
             )
           );
           return [];
@@ -20719,7 +20777,7 @@ var command = rootCommand.pipe(
 );
 var cli = Command_exports.run(command, {
   name: "priiisk camp control",
-  version: "0.1.7"
+  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.7",
+  "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-3V5SHVCX.js",
-    "dist/chunk-4VQ2KUN7.js",
-    "dist/chunk-7U7PROSV.js",
-    "dist/chunk-JND6HOSJ.js",
-    "dist/chunk-JND6HOSJ.js.LEGAL.txt",
-    "dist/chunk-VLP2ZKVV.js",
-    "dist/chunk-WEYE43UO.js",
-    "dist/chunk-WEYE43UO.js.LEGAL.txt",
-    "dist/chunk-YOW4MMBD.js",
-    "dist/chunk-ZUREJQA6.js",
+    "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",