chatroom-cli 1.94.1 → 1.95.0

package/dist/index.js

@@ -28452,6 +28452,44 @@ var init_model_variant = __esm(() => {
   PARAM_RE = /^[A-Za-z0-9_-]+=[^,\[\]\=]+$/;
 });
 
+// ../../services/backend/src/domain/entities/harness/model-provider.ts
+function prefixModelWithProvider(provider, modelId) {
+  const bracket = modelId.indexOf("[");
+  const base = bracket === -1 ? modelId : modelId.slice(0, bracket);
+  const suffix = bracket === -1 ? "" : modelId.slice(bracket);
+  if (base.includes("/"))
+    return modelId;
+  return `${provider}/${base}${suffix}`;
+}
+function stripProviderPrefix(provider, modelId) {
+  const prefix = `${provider}/`;
+  return modelId.startsWith(prefix) ? modelId.slice(prefix.length) : modelId;
+}
+function inferCopilotModelProvider(modelId) {
+  const base = modelId.split("[")[0];
+  if (base.startsWith("claude"))
+    return "anthropic";
+  if (base.startsWith("gpt"))
+    return "openai";
+  if (base.startsWith("gemini"))
+    return "google";
+  return "github-copilot";
+}
+function inferCommandCodeModelProvider(modelId) {
+  const base = modelId.split("[")[0];
+  if (base.startsWith("claude"))
+    return "anthropic";
+  if (base.startsWith("gpt"))
+    return "openai";
+  return "commandcode";
+}
+function prefixCatalogModels(provider, models) {
+  return models.map((model) => prefixModelWithProvider(provider, model));
+}
+function prefixCatalogModelsWithInfer(infer, models) {
+  return models.map((model) => prefixModelWithProvider(infer(model), model));
+}
+
 // src/daemon/infrastructure/local/harness/services/cursor-sdk/cursor-sdk-package.ts
 var exports_cursor_sdk_package = {};
 __export(exports_cursor_sdk_package, {
@@ -28604,7 +28642,7 @@ async function fetchCursorSdkModelCatalog() {
   try {
     const sdk = await importBundledCursorSdk();
     const models = await sdk.Cursor.models.list();
-    return expandCursorSdkModelCatalog(models);
+    return prefixCatalogModels("cursor", expandCursorSdkModelCatalog(models));
   } catch (err) {
     console.warn(`[cursor] listModels failed:`, err instanceof Error ? err.message : err);
     return [];
@@ -28891,6 +28929,9 @@ var init_copilot_stream_reader = __esm(() => {
 });
 
 // src/daemon/infrastructure/local/harness/services/copilot/copilot-agent-service.ts
+function resolveCopilotSpawnModel(model) {
+  return stripProviderPrefix(inferCopilotModelProvider(model), model);
+}
 var COPILOT_COMMAND = "copilot", CopilotAgentService;
 var init_copilot_agent_service = __esm(() => {
   init_base_cli_agent_service();
@@ -28916,7 +28957,7 @@ var init_copilot_agent_service = __esm(() => {
       const args2 = ["-p"];
       args2.push("--stream", "on");
       if (options.model) {
-        args2.push("--model", options.model);
+        args2.push("--model", resolveCopilotSpawnModel(options.model));
       }
       args2.push("--allow-all");
       args2.push(prompt);
@@ -29038,13 +29079,14 @@ var init_claude_model_variants = __esm(() => {
 function decodeClaudeVariant(encoded) {
   if (encoded === undefined)
     return;
+  const stripped = stripProviderPrefix("anthropic", encoded);
   try {
-    const d = validateModelVariantParams(decodeModelVariant(encoded), CLAUDE_MODEL_VARIANT_COMBINATIONS);
+    const d = validateModelVariantParams(decodeModelVariant(stripped), CLAUDE_MODEL_VARIANT_COMBINATIONS);
     const effort = d.params.effort;
     return { model: d.model, ...effort && effort !== "none" ? { effort } : {} };
   } catch (error) {
-    if (!encoded.includes("["))
-      return { model: encoded };
+    if (!stripped.includes("["))
+      return { model: stripped };
     throw error;
   }
 }
@@ -30656,7 +30698,7 @@ function buildAgentName(context5) {
 function decodeCodexVariant(encoded) {
   if (encoded === undefined)
     return;
-  return validateModelVariantParams(decodeModelVariant(encoded), CODEX_MODEL_VARIANT_COMBINATIONS);
+  return validateModelVariantParams(decodeModelVariant(stripProviderPrefix("openai", encoded)), CODEX_MODEL_VARIANT_COMBINATIONS);
 }
 function buildThreadOptions(workingDir, variant) {
   const options = {
@@ -31228,7 +31270,7 @@ var init_command_code_agent_service = __esm(() => {
       return this.checkVersion(COMMANDCODE_COMMAND);
     }
     async listModels() {
-      return COMMANDCODE_MODELS;
+      return COMMANDCODE_MODELS.map((model) => prefixModelWithProvider(inferCommandCodeModelProvider(model), model));
     }
     createExitSubscription(childProcess, pid, context5) {
       let exitInfo = null;
@@ -78163,6 +78205,7 @@ var init_participant = __esm(() => {
   ONLINE_OR_STARTING_STATUSES = new Set([
     "agent.waiting",
     "agent.requestStart",
+    "agent.restart",
     "agent.started",
     "task.acknowledged",
     "task.inProgress",
@@ -79000,6 +79043,32 @@ var init_builder_to_planner = __esm(() => {
   init_role_guidance_disclosure();
 });
 
+// ../../services/backend/prompts/enhancer/defragmentation-reference.ts
+function renderDefragmentationHandoffReference() {
+  return [
+    "### Defragmentation workflow checklist",
+    'Complete the optional **Defragmentation** section when the planner check-in addresses a large or multi-surface system revision, including refactoring, consolidation, or consistency work. Write exactly "Not Applicable." only when no such revision is proposed.',
+    "",
+    "1. **Study surfaces** — map all call sites, use cases, and complexity variants before proposing slices; name every relevant file/module",
+    "2. **Golden implementation** — build a standalone canonical solution first; introduce canonical domain entities/types only when the studied variants require them, then shared use cases, UI components, or utilities; do not patch duplicates in place",
+    "3. **Migrate callers** — refactor all consumers to the golden path; each slice must be shippable end-to-end",
+    "4. **Delete legacy** — remove old implementations only after migration is complete; no dead-code leftovers",
+    "",
+    "### Anti-patterns to flag",
+    "- Incremental copy-paste fixes across N files without a golden SSOT",
+    "- New abstraction without studying all existing variants",
+    '- Leaving old code "for safety" after migration',
+    "- Slices that add helpers/infra without a runnable end-to-end outcome",
+    "- Parallel implementations coexisting without a deletion plan",
+    "",
+    "### Structural decisions",
+    "- Identify SSOT locations for domain entities, shared use cases, and UI components",
+    "- Align with `structural-decisions` glossary: folder structure, file naming, interface locations",
+    "- Flag when the plan scatters the canonical implementation across unrelated modules"
+  ].join(`
+`);
+}
+
 // ../../services/backend/prompts/enhancer/webapp-ux-reference.ts
 function renderWebappUxHandoffReference() {
   return [
@@ -79098,7 +79167,7 @@ function getEnhancerFeedbackTemplateBody() {
 <specific misreadings or missing constraints — what the user asked vs what the planner proposed>
 </handoff-overview>
 
-<!-- UI collapses proofs, direction, ux, and notes by default; overview and action required are expanded -->
+<!-- UI collapses proofs, direction, ux, defragmentation, and notes by default; overview and action required are expanded -->
 
 <handoff-proofs>
 ## Reasoning review
@@ -79125,6 +79194,20 @@ function getEnhancerFeedbackTemplateBody() {
 - **Bulk safeguards:** <batch/multi-item operations gated by confirm with count/impact summary; cite missing confirms>
 </handoff-ux>
 
+<handoff-defragmentation>
+<!-- Optional — write exactly "Not Applicable." when no large or multi-surface system revision is proposed -->
+<!-- When revision work is proposed: specific findings tied to the planner's proposal. No code blocks (use Suggested edits). -->
+- **Surfaces:** <call sites and modules identified; gaps in surface mapping>
+- **Golden path:** <whether planner builds standalone canonical implementation first>
+- **Domain model:** <canonical types/entities needed or "not needed">
+- **Shared components:** <shared abstractions planned (use cases, UI, utilities)>
+- **Slice ordering:** <study → golden → migrate → delete sequence respected?>
+- **Migration plan:** <how all callers move to golden path>
+- **Deletion plan:** <old implementations slated for removal>
+- **Duplication:** <existing duplicates to eliminate; risk of new duplication>
+- **Structural decisions:** <folder/module boundaries; SSOT locations>
+</handoff-defragmentation>
+
 <handoff-notes>
 ## Knowledge gaps
 <specific facts, files, or research to verify — name what to check and why>
@@ -79163,10 +79246,12 @@ ${getHandoffReportTemplateIntro("Planning Feedback (Enhancer → Planner)")}
 
 The planner sent you three XML sections. Your job is **advisory adversarial review** — raise risks, challenge assumptions, align with user intent. Be **specific and targeted**: cite concrete claims, files, UX choices, and gaps from the check-in so the planner can improve the plan without re-synthesizing vague feedback.
 
-Give **concrete, actionable recommendations** in every section. End with **Recommendations** (second-last: summarized suggestions, tradeoffs, and considerations) then **Suggested edits** (last: proposed edits to grounding and the builder-handoff with file paths and code snippets). For UI work, complete the optional **UX** section using the reference below. **Do not rewrite their full builder brief.** The planner makes the final call.
+Give **concrete, actionable recommendations** in every section. End with **Recommendations** (second-last: summarized suggestions, tradeoffs, and considerations) then **Suggested edits** (last: proposed edits to grounding and the builder-handoff with file paths and code snippets). For UI work, complete the optional **UX** section using the reference below. For large or multi-surface revision work, complete the optional **Defragmentation** section using its reference below. **Do not rewrite their full builder brief.** The planner makes the final call.
 
 ${renderWebappUxHandoffReference()}
 
+${renderDefragmentationHandoffReference()}
+
 \`\`\`markdown
 ${getEnhancerFeedbackTemplateBody()}
 \`\`\`
@@ -80212,6 +80297,24 @@ var init_generator = __esm(() => {
   init_review_guidelines();
 });
 
+// src/infrastructure/deps/create-convex-command-deps.ts
+async function createConvexCommandDeps() {
+  const client4 = await getConvexClient();
+  const backend2 = {
+    mutation: (endpoint, args2) => client4.mutation(endpoint, args2),
+    query: (endpoint, args2) => client4.query(endpoint, args2)
+  };
+  const session2 = { getSessionId, getConvexUrl, getOtherSessionUrls };
+  return {
+    backend: backend2,
+    session: session2
+  };
+}
+var init_create_convex_command_deps = __esm(() => {
+  init_storage();
+  init_client2();
+});
+
 // src/commands/handoff/index.ts
 var exports_handoff = {};
 __export(exports_handoff, {
@@ -80219,18 +80322,7 @@ __export(exports_handoff, {
   handoff: () => handoff
 });
 async function createDefaultDeps10() {
-  const client4 = await getConvexClient();
-  return {
-    backend: {
-      mutation: (endpoint, args2) => client4.mutation(endpoint, args2),
-      query: (endpoint, args2) => client4.query(endpoint, args2)
-    },
-    session: {
-      getSessionId,
-      getConvexUrl,
-      getOtherSessionUrls
-    }
-  };
+  return createConvexCommandDeps();
 }
 function handleHandoffError(err) {
   return exports_Effect.sync(() => {
@@ -80347,8 +80439,7 @@ var init_handoff = __esm(() => {
   init_values();
   init_esm();
   init_api3();
-  init_storage();
-  init_client2();
+  init_create_convex_command_deps();
   init_services();
   init_error_formatting();
 });
@@ -81645,18 +81736,7 @@ __export(exports_skill, {
   activateSkill: () => activateSkill
 });
 async function createDefaultDeps15() {
-  const client4 = await getConvexClient();
-  return {
-    backend: {
-      mutation: (endpoint, args2) => client4.mutation(endpoint, args2),
-      query: (endpoint, args2) => client4.query(endpoint, args2)
-    },
-    session: {
-      getSessionId,
-      getConvexUrl,
-      getOtherSessionUrls
-    }
-  };
+  return createConvexCommandDeps();
 }
 function handleListSkillsError(err) {
   return exports_Effect.sync(() => {
@@ -81782,8 +81862,7 @@ var listSkillsEffect = (chatroomId, _options) => exports_Effect.gen(function* ()
 var init_skill = __esm(() => {
   init_esm();
   init_api3();
-  init_storage();
-  init_client2();
+  init_create_convex_command_deps();
   init_services();
   init_convex_error();
 });
@@ -81841,6 +81920,111 @@ var init_send = __esm(() => {
   init_client2();
 });
 
+// ../../services/backend/src/domain/usecase/message/serialize-message.ts
+function attachmentContext(options) {
+  return { chatroomId: options.chatroomId ?? "", role: options.role ?? "" };
+}
+function serializeLinearMessage(message, options) {
+  const target = message.targetRole ? ` → ${message.targetRole}` : "";
+  const attachments = message.attachments ? renderDeliveryAttachmentsBlock(message.attachments, attachmentContext(options)).join(`
+`) : "";
+  return `${new Date(message._creationTime).toISOString()} | ${message.senderRole}${target}
+${attachments ? `${attachments}
+` : ""}
+${message.content}`;
+}
+function serializeTaskOriginMessage(message) {
+  return `<message sender="${escapeXmlAttribute(message.senderRole)}" message-id="${escapeXmlAttribute(message._id)}">
+<message-content>
+${escapeXmlText(message.content)}
+</message-content>
+</message>`;
+}
+function serializeContextXmlMessage(message, options) {
+  const indent = options.indent ?? "   ";
+  const attrs = contextMessageAttributes(message);
+  const task = contextTaskBlock(message, indent);
+  const attachmentLines = contextAttachmentLines(message, options, indent);
+  return [
+    `<message ${attrs}>`,
+    task,
+    ...attachmentLines,
+    `${indent}Content:`,
+    `${indent}<message-content>`,
+    `${indent}${indent}${escapeXmlText(message.content)}`,
+    `${indent}</message-content>`,
+    `</message>`
+  ].filter(Boolean).join(`
+`);
+}
+function contextMessageAttributes(message) {
+  const target = message.targetRole ? ` to="${escapeXmlAttribute(message.targetRole)}"` : "";
+  return `id="${escapeXmlAttribute(message._id)}" from="${escapeXmlAttribute(message.senderRole)}"${target} type="${escapeXmlAttribute(message.type)}"`;
+}
+function contextTaskBlock(message, indent) {
+  if (!message.task)
+    return "";
+  return `
+${indent}<task id="${escapeXmlAttribute(message.task._id)}" status="${escapeXmlAttribute(message.task.status)}">
+${indent}${indent}${escapeXmlText(message.task.content)}
+${indent}</task>`;
+}
+function contextAttachmentLines(message, options, indent) {
+  if (!message.attachments)
+    return [];
+  return renderDeliveryAttachmentsBlock(message.attachments, attachmentContext(options)).map((line) => line ? indent + line : "");
+}
+function serializeMessage(message, options) {
+  switch (options.profile) {
+    case "linear":
+      return serializeLinearMessage(message, options);
+    case "task-origin":
+      return serializeTaskOriginMessage(message);
+    case "context-xml":
+      return serializeContextXmlMessage(message, options);
+  }
+}
+var init_serialize_message = __esm(() => {
+  init_render_delivery_attachments();
+});
+
+// ../../services/backend/src/domain/usecase/message/to-serializable-message.ts
+function normalizeDeliveryAttachments(input) {
+  const attachments = {
+    attachedTasks: input.attachedTasks?.map((item) => ({
+      _id: item._id,
+      content: item.content,
+      status: item.status ?? item.backlogStatus ?? ""
+    })),
+    attachedBacklogItems: input.attachedBacklogItems?.map((item) => ({
+      _id: item._id ?? item.id ?? "",
+      content: item.content,
+      status: item.status
+    })),
+    attachedMessages: input.attachedMessages,
+    attachedSnippets: input.attachedSnippets
+  };
+  return Object.values(attachments).some((items) => items && items.length > 0) ? attachments : undefined;
+}
+function normalizeTask(input) {
+  if (!input.taskId || input.taskStatus == null || input.taskContent == null)
+    return;
+  return { _id: input.taskId, status: input.taskStatus, content: input.taskContent };
+}
+function toSerializableMessage(input) {
+  const attachments = normalizeDeliveryAttachments(input);
+  return {
+    _id: input._id,
+    _creationTime: input._creationTime,
+    senderRole: input.senderRole,
+    targetRole: input.targetRole,
+    type: input.type,
+    content: input.content,
+    ...attachments ? { attachments } : {},
+    ...normalizeTask(input) ? { task: normalizeTask(input) } : {}
+  };
+}
+
 // src/commands/messages/messages-fs-service.ts
 import * as nodeFs2 from "node:fs/promises";
 function messageFilename(msg) {
@@ -81848,13 +82032,6 @@ function messageFilename(msg) {
   const receiver = msg.targetRole ?? "all";
   return `${sortPrefix}_${msg.senderRole}-to-${receiver}_${msg._id}.md`;
 }
-function buildLinearMessageContent(msg) {
-  const ts = new Date(msg._creationTime).toISOString();
-  const receiver = msg.targetRole ? ` → ${msg.targetRole}` : "";
-  return `${ts} | ${msg.senderRole}${receiver}
-
-${msg.content}`;
-}
 var MessagesFsService, MessagesFsServiceLive, SORT_KEY_MAX = 9999999999999;
 var init_messages_fs_service = __esm(() => {
   init_esm();
@@ -82031,7 +82208,11 @@ var PAGE_SIZE = 50, SINCE_PAGE_SIZE = 500, ABSOLUTE_MAX = 5000, DEFAULT_LIMIT =
   const manifestEntries = [];
   for (const msg of messages) {
     const file = messageFilename(msg);
-    const content = buildLinearMessageContent(msg);
+    const content = serializeMessage(toSerializableMessage(msg), {
+      profile: "linear",
+      chatroomId,
+      role: options.role
+    });
     const filePath = nodePath2.join(outputDir, file);
     yield* fs11.writeFile(filePath, content).pipe(exports_Effect.mapError((cause3) => ({
       _tag: "WriteFailed",
@@ -82089,6 +82270,7 @@ var PAGE_SIZE = 50, SINCE_PAGE_SIZE = 500, ABSOLUTE_MAX = 5000, DEFAULT_LIMIT =
   });
 });
 var init_download = __esm(() => {
+  init_serialize_message();
   init_esm();
   init_messages_fs_service();
   init_api3();
@@ -82400,18 +82582,19 @@ __export(exports_context2, {
   inspectContext: () => inspectContext
 });
 async function createDefaultDeps18() {
-  const client4 = await getConvexClient();
-  return {
-    backend: {
-      mutation: (endpoint, args2) => client4.mutation(endpoint, args2),
-      query: (endpoint, args2) => client4.query(endpoint, args2)
-    },
-    session: {
-      getSessionId,
-      getConvexUrl,
-      getOtherSessionUrls
-    }
-  };
+  return createConvexCommandDeps();
+}
+function requireAuthenticatedChatroom(chatroomId) {
+  return exports_Effect.gen(function* () {
+    const sessionId = yield* requireSessionIdEffect(() => ({
+      _tag: "NotAuthenticated"
+    }));
+    yield* validateChatroomIdEffect(chatroomId, (id3) => ({
+      _tag: "InvalidChatroomId",
+      id: id3
+    }));
+    return sessionId;
+  });
 }
 function handleContextError(err) {
   return exports_Effect.sync(() => {
@@ -82464,13 +82647,7 @@ async function inspectContext(chatroomId, options, deps) {
 }
 var readContextEffect = (chatroomId, options) => exports_Effect.gen(function* () {
   const backend2 = yield* BackendService;
-  const sessionId = yield* requireSessionIdEffect(() => ({
-    _tag: "NotAuthenticated"
-  }));
-  yield* validateChatroomIdEffect(chatroomId, (id3) => ({
-    _tag: "InvalidChatroomId",
-    id: id3
-  }));
+  const sessionId = yield* requireAuthenticatedChatroom(chatroomId);
   const context5 = yield* backend2.query(api.messages.getContextForRole, {
     sessionId,
     chatroomId,
@@ -82517,47 +82694,12 @@ var readContextEffect = (chatroomId, options) => exports_Effect.gen(function* ()
 \uD83D\uDCAC Chat History:`);
     console.log("─".repeat(60));
     for (const message of context5.messages) {
-      const toAttr = message.targetRole ? ` to="${message.targetRole}"` : "";
-      console.log(`<message id="${message._id}" from="${message.senderRole}"${toAttr} type="${message.type}">`);
-      if (message.taskId) {
-        console.log(`   Task:`);
-        console.log(`      ID: ${message.taskId}`);
-        if (message.taskStatus) {
-          console.log(`      Status: ${message.taskStatus}`);
-        }
-        if (message.taskContent) {
-          const safeTaskContent = sanitizeForTerminal(message.taskContent);
-          console.log(`      Content:`);
-          console.log(`      <task-content>`);
-          console.log(safeTaskContent.split(`
-`).map((l) => `      ${l}`).join(`
-`));
-          console.log(`      </task-content>`);
-        }
-      }
-      if (message.attachedTasks && message.attachedTasks.length > 0) {
-        console.log(`   Attachments:`);
-        for (const task of message.attachedTasks) {
-          console.log(`      \uD83D\uDD39 Task ID: ${task._id}`);
-          console.log(`         Type: Task`);
-          const contentLines = sanitizeForTerminal(task.content).split(`
-`);
-          console.log(`         Content:`);
-          console.log(`         <task-content>`);
-          for (const line of contentLines) {
-            console.log(`         ${line}`);
-          }
-          console.log(`         </task-content>`);
-        }
-      }
-      console.log(`   Content:`);
-      console.log(`   <message-content>`);
-      const safeMessageContent = sanitizeForTerminal(message.content);
-      console.log(safeMessageContent.split(`
-`).map((l) => `      ${l}`).join(`
-`));
-      console.log(`   </message-content>`);
-      console.log(`</message>`);
+      const serialized = serializeMessage(toSerializableMessage(message), {
+        profile: "context-xml",
+        chatroomId,
+        role: options.role
+      });
+      console.log(sanitizeForTerminal(serialized));
     }
     console.log(`
 ` + "═".repeat(60));
@@ -82565,13 +82707,7 @@ var readContextEffect = (chatroomId, options) => exports_Effect.gen(function* ()
   });
 }), newContextEffect = (chatroomId, options) => exports_Effect.gen(function* () {
   const backend2 = yield* BackendService;
-  const sessionId = yield* requireSessionIdEffect(() => ({
-    _tag: "NotAuthenticated"
-  }));
-  yield* validateChatroomIdEffect(chatroomId, (id3) => ({
-    _tag: "InvalidChatroomId",
-    id: id3
-  }));
+  const sessionId = yield* requireAuthenticatedChatroom(chatroomId);
   if (!options.content || options.content.trim().length === 0) {
     return yield* exports_Effect.fail({ _tag: "EmptyContent" });
   }
@@ -82682,11 +82818,11 @@ var readContextEffect = (chatroomId, options) => exports_Effect.gen(function* ()
   });
 });
 var init_context2 = __esm(() => {
+  init_serialize_message();
   init_esm();
   init_format_new_context_error();
   init_api3();
-  init_storage();
-  init_client2();
+  init_create_convex_command_deps();
   init_services();
 });
 
@@ -82815,18 +82951,7 @@ __export(exports_artifact, {
   createArtifact: () => createArtifact
 });
 async function createDefaultDeps20() {
-  const client4 = await getConvexClient();
-  return {
-    backend: {
-      mutation: (endpoint, args2) => client4.mutation(endpoint, args2),
-      query: (endpoint, args2) => client4.query(endpoint, args2)
-    },
-    session: {
-      getSessionId,
-      getConvexUrl,
-      getOtherSessionUrls
-    }
-  };
+  return createConvexCommandDeps();
 }
 function handleArtifactError(err) {
   return exports_Effect.sync(() => {
@@ -82977,8 +83102,7 @@ var createArtifactEffect = (chatroomId, options) => exports_Effect.gen(function*
 var init_artifact = __esm(() => {
   init_esm();
   init_api3();
-  init_storage();
-  init_client2();
+  init_create_convex_command_deps();
   init_services();
   init_file_content();
   artifactErrorHandlers = {
@@ -98469,9 +98593,11 @@ function parseAssignedTaskSignal(raw) {
   return assignedTaskSignalSchema.parse(raw);
 }
 function parseAssignedTaskPresenceSignal(raw) {
+  const full = assignedTaskPresenceSignalSchema.safeParse(raw);
+  if (full.success)
+    return full.data;
   const delta = assignedTaskPresenceDeltaSchema.safeParse(raw);
-  const hasFullWireFields = typeof raw === "object" && raw !== null && "chatroomId" in raw && "presenceUpdatedAt" in raw;
-  if (delta.success && !hasFullWireFields) {
+  if (delta.success) {
     const presenceUpdatedAt = Number(delta.data.presenceKey.split(":")[0]);
     const resolvedAt = Number.isFinite(presenceUpdatedAt) ? presenceUpdatedAt : 0;
     return {
@@ -99394,11 +99520,13 @@ async function runRestartOrchestrator(deps, event) {
   markRestartOrchestratorInFlight(chatroomId, role, event.correlationId);
   try {
     resetRoleDeliveryState(chatroomId, role);
+    await emitPhase(deps, event, "reset");
     await deps.agentMgr.stop({
       chatroomId,
       role,
       reason: "user.restart"
     });
+    await emitPhase(deps, event, "spawn");
     const spawnResult = await exports_Effect.runPromise(deps.agentMgr.ensureRunning({
       chatroomId,
       role,
@@ -99412,13 +99540,17 @@ async function runRestartOrchestrator(deps, event) {
       await emitPhase(deps, event, "failed", spawnResult.error ?? "spawn failed");
       return;
     }
+    await emitPhase(deps, event, "await_session");
     const harnessSessionId = await waitForHarnessSessionId(deps, event, spawnResult.pid);
     if (!harnessSessionId) {
       await emitPhase(deps, event, "failed", "harnessSessionId timeout");
       return;
     }
     await forceNativeWaiting(deps, event);
+    await emitPhase(deps, event, "ready");
+    await emitPhase(deps, event, "deliver");
     const deliveredTaskIds = await deliverPendingTasks(deps, event);
+    await emitPhase(deps, event, "completed");
     await deps.session.backend.mutation(api.machines.emitRestartCompleted, {
       sessionId: deps.session.sessionId,
       machineId: deps.session.machineId,
@@ -105946,9 +106078,9 @@ var init_claude_session = () => {};
 
 // ../../services/backend/src/domain/entities/harness/model-catalog.ts
 function codexModelVariants() {
-  return expandModelVariantCatalog(CODEX_MODEL_IDS, CODEX_MODEL_VARIANT_COMBINATIONS);
+  return prefixCatalogModels("openai", expandModelVariantCatalog(CODEX_MODEL_IDS, CODEX_MODEL_VARIANT_COMBINATIONS));
 }
-var claudeModelVariants = () => expandModelVariantCatalog(CLAUDE_CATALOG_BASE_MODEL_IDS, CLAUDE_MODEL_VARIANT_COMBINATIONS), CODEX_MODEL_IDS, HARNESS_MODEL_CATALOG;
+var claudeModelVariants = () => prefixCatalogModels("anthropic", expandModelVariantCatalog(CLAUDE_CATALOG_BASE_MODEL_IDS, CLAUDE_MODEL_VARIANT_COMBINATIONS)), CODEX_MODEL_IDS, HARNESS_MODEL_CATALOG;
 var init_model_catalog = __esm(() => {
   init_claude_model_variants();
   init_codex_sdk_model_variants();
@@ -105962,7 +106094,7 @@ var init_model_catalog = __esm(() => {
   ];
   HARNESS_MODEL_CATALOG = {
     "codex-sdk": codexModelVariants(),
-    copilot: [
+    copilot: prefixCatalogModelsWithInfer(inferCopilotModelProvider, [
       "claude-3-5-sonnet-20241022",
       "claude-3-5-haiku-20241022",
       "claude-haiku-4.5",
@@ -105973,7 +106105,7 @@ var init_model_catalog = __esm(() => {
       "gpt-4-turbo",
       "gemini-3-pro-preview",
       "gemini-2-5-flash"
-    ],
+    ]),
     claude: claudeModelVariants(),
     "claude-sdk": claudeModelVariants()
   };
@@ -127268,13 +127400,13 @@ import { dirname as dirname15, join as join27 } from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
 function clientDistCandidates(here) {
   return [
+    join27(here, "client/build"),
     join27(here, "../client/build"),
-    join27(here, "../src/daemon/local-web/client/build"),
-    join27(here, "../../../src/daemon/local-web/client/build")
+    join27(here, "../src/daemon/local-web/client/build")
   ];
 }
-function resolveClientDistDir() {
-  const candidates = clientDistCandidates(dirname15(fileURLToPath7(import.meta.url)));
+function resolveClientDistDir(here = dirname15(fileURLToPath7(import.meta.url))) {
+  const candidates = clientDistCandidates(here);
   for (const dir of candidates) {
     if (existsSync9(join27(dir, "index.html")))
       return dir;
@@ -127556,7 +127688,7 @@ async function startLocalWebServer(config4, deps = {}) {
     throw new Error(`local-web must bind to 127.0.0.1 only (got ${config4.host})`);
   }
   const streamHub = deps.streamHub ?? createStreamHub();
-  const clientDistDir = resolveClientDistDir();
+  const clientDistDir = deps.clientDistDir ?? resolveClientDistDir();
   const server2 = createServer((req, res) => {
     if (tryServeStatic(req, res, clientDistDir))
       return;
@@ -128893,4 +129025,4 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=270BCA25C4386AFE64756E2164756E21
+//# debugId=3C5E79A2AC47FADE64756E2164756E21