@remixhq/claude-plugin 0.1.16 → 0.1.18

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "remix",
   "description": "Remix collaboration workflows for Claude Code",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "author": {
     "name": "Remix"
   },

package/agents/remix-collab.md

@@ -1,6 +1,6 @@
 ---
 name: remix-collab
-description: Specialized Claude agent for Remix repository collaboration, merge request review, sync, reconcile, and change-step recording workflows.
+description: Specialized Claude agent for Remix repository collaboration, merge request review, sync, reconcile, and queued finalize-turn workflows.
 ---
 
 You are the Remix collaboration specialist.
@@ -32,19 +32,24 @@ Operating rules:
 9. Clearly explain local mutation risk before using tools that can modify the local repo.
 10. In a bound repo, Remix MCP tools are the required workflow layer for ordinary collaboration work.
 11. In a bound repo, exactly one final `remix_collab_finalize_turn` is required before the final user-facing response.
-12. The final recording call must use the exact user prompt and your final assistant response.
-13. Do not finish the turn before recording. Do not make additional repo mutations after the final turn-recording call unless you intend to record again.
-14. Do not duplicate core business logic in reasoning. Use the MCP tools to inspect and execute the workflow.
+12. `remix_collab_finalize_turn` is queued only. A remote change step does not exist yet until the finalize queue drains successfully.
+13. The final recording call must use the exact user prompt and your final assistant response.
+14. If `remix_collab_status` reports `await_finalize`, use `remix_collab_drain_finalize_queue`, then re-check status before merge-related or recovery flows that depend on a remote recorded turn.
+15. Do not finish the turn before recording. Do not make additional repo mutations after the final turn-recording call unless you intend to record again.
+16. Do not duplicate core business logic in reasoning. Use the MCP tools to inspect and execute the workflow.
 
 When appropriate:
 
 - use `remix_collab_init` to bind the current repo
 - use `remix_collab_remix` to start from an existing app lineage
 - use `remix_collab_checkout` to continue work on an existing app id without creating a fork
+- when the user asks for an app's dashboard URL and an `appId` is known, answer with `https://dashboard.remix.one/apps/<appId>` without requiring an additional tool call
 - when helping the user choose an app, prefer scoped or membership-oriented discovery first: use `organizationId` / `projectId` when known, or use `ownership` with `accessScope="explicit_member"` when the user means “apps I can work on”
 - reserve `accessScope="all_readable"` for explicit public or broad readable discovery, not as the default work-oriented app picker
 - use memory summary/search/timeline tools before repo inspection when historical context or reasoning is needed
 - use the explicit change-step diff tool only after you already know which `changeStepId` matters
 - use `remix_collab_finalize_turn` as the final turn recorder
+- treat `remix_collab_finalize_turn` as local capture plus queueing, not immediate remote materialization
+- use `remix_collab_drain_finalize_queue` and `remix_collab_status` when the workflow is blocked on `await_finalize`
 - use `remix_collab_review_queue` for reviewable merge requests, `remix_collab_my_merge_requests` for authored requests, and `remix_collab_list_app_merge_requests` for app-scoped MR flows with required `queue` set to `app_reviewable`, `app_outgoing`, or `app_related_visible`
 - use merge request tools for review and approval flows

package/dist/hook-post-collab.cjs

@@ -685,6 +685,12 @@ function normalizeStringArray(value) {
     )
   );
 }
+function normalizeManualRecordingScope(value) {
+  if (value === "full_turn") {
+    return "full_turn";
+  }
+  return null;
+}
 function normalizeTouchedRepo(value, repoRoot) {
   if (!value || typeof value !== "object") return null;
   const parsed = value;
@@ -703,7 +709,7 @@ function normalizeTouchedRepo(value, repoRoot) {
     manuallyRecorded: Boolean(parsed.manuallyRecorded),
     manuallyRecordedAt: normalizeString(parsed.manuallyRecordedAt),
     manuallyRecordedByTool: normalizeString(parsed.manuallyRecordedByTool),
-    manualRecordingScope: parsed.manualRecordingScope === "change_step" || parsed.manualRecordingScope === "full_turn" ? parsed.manualRecordingScope : null,
+    manualRecordingScope: normalizeManualRecordingScope(parsed.manualRecordingScope),
     manualRemoteChangeRecordedAt: normalizeString(parsed.manualRemoteChangeRecordedAt),
     stopAttempted: Boolean(parsed.stopAttempted),
     stopRecorded: Boolean(parsed.stopRecorded),
@@ -855,7 +861,7 @@ async function markPendingTurnConsultedMemory(sessionId) {
 // package.json
 var package_default = {
   name: "@remixhq/claude-plugin",
-  version: "0.1.16",
+  version: "0.1.18",
   description: "Claude Code plugin for Remix collaboration workflows",
   homepage: "https://github.com/RemixDotOne/remix-claude-plugin",
   license: "MIT",
@@ -886,8 +892,8 @@ var package_default = {
     prepack: "npm run build"
   },
   dependencies: {
-    "@remixhq/core": "^0.1.11",
-    "@remixhq/mcp": "^0.1.11"
+    "@remixhq/core": "^0.1.13",
+    "@remixhq/mcp": "^0.1.13"
   },
   devDependencies: {
     "@types/node": "^25.4.0",
@@ -7751,7 +7757,7 @@ var {
   getCancelSignal: getCancelSignal2
 } = getIpcExport();
 
-// node_modules/@remixhq/core/dist/chunk-RREREIGW.js
+// node_modules/@remixhq/core/dist/chunk-WT6VRLXU.js
 async function runGit(args, cwd) {
   const res = await execa("git", args, { cwd, stderr: "ignore" });
   return String(res.stdout || "").trim();
@@ -7765,7 +7771,7 @@ async function getCurrentBranch(cwd) {
   }
 }
 
-// node_modules/@remixhq/core/dist/chunk-4L3ZBZUQ.js
+// node_modules/@remixhq/core/dist/chunk-YCFLOHJV.js
 var import_promises14 = __toESM(require("fs/promises"), 1);
 var import_path = __toESM(require("path"), 1);
 var import_promises15 = __toESM(require("fs/promises"), 1);
@@ -7787,7 +7793,8 @@ function buildBindingFileV3(params) {
     repoFingerprint: params.repoFingerprint,
     remoteUrl: params.remoteUrl,
     defaultBranch: params.defaultBranch,
-    branchBindings: params.branchBindings
+    branchBindings: params.branchBindings,
+    ...params.explicitRootBinding ? { explicitRootBinding: params.explicitRootBinding } : {}
   };
 }
 function normalizeBranchName(value) {
@@ -7806,7 +7813,7 @@ function normalizeBranchBinding(value) {
     upstreamAppId: value.upstreamAppId,
     threadId: value.threadId ?? null,
     laneId: value.laneId ?? null,
-    bindingMode: value.bindingMode === "legacy" ? "legacy" : "lane"
+    bindingMode: value.bindingMode === "legacy" ? "legacy" : value.bindingMode === "explicit_root" ? "explicit_root" : "lane"
   };
 }
 function buildResolvedBinding(params) {
@@ -7880,6 +7887,7 @@ async function readCollabBindingState(repoRoot, options) {
         defaultBranch: migratedFile.defaultBranch,
         currentBranch,
         branchBindings: migratedFile.branchBindings,
+        explicitRootBinding: null,
         binding: buildResolvedBinding({
           fallbackProjectId: projectId,
           repoFingerprint: migratedFile.repoFingerprint,
@@ -7923,7 +7931,22 @@ async function readCollabBindingState(repoRoot, options) {
       };
       shouldPersistNormalizedBranchBindings = true;
     }
-    if (persist && ("explicitBinding" in file || shouldPersistNormalizedBranchBindings || parsed.schemaVersion === 2)) {
+    let explicitRootBinding = normalizeBranchBinding(file.explicitRootBinding ?? null);
+    if (explicitRootBinding && !explicitRootBinding.projectId && legacyProjectId) {
+      explicitRootBinding = {
+        ...explicitRootBinding,
+        projectId: legacyProjectId
+      };
+      shouldPersistNormalizedBranchBindings = true;
+    }
+    if (explicitRootBinding && explicitRootBinding.bindingMode !== "explicit_root") {
+      explicitRootBinding = {
+        ...explicitRootBinding,
+        bindingMode: "explicit_root"
+      };
+      shouldPersistNormalizedBranchBindings = true;
+    }
+    if (persist && ("explicitBinding" in file || "explicitRootBinding" in file || shouldPersistNormalizedBranchBindings || parsed.schemaVersion === 2)) {
       try {
         await writeJsonAtomic2(
           filePath,
@@ -7931,7 +7954,8 @@ async function readCollabBindingState(repoRoot, options) {
             repoFingerprint: file.repoFingerprint ?? null,
             remoteUrl: file.remoteUrl ?? null,
             defaultBranch: file.defaultBranch ?? null,
-            branchBindings
+            branchBindings,
+            explicitRootBinding
           })
         );
       } catch {
@@ -7942,8 +7966,23 @@ async function readCollabBindingState(repoRoot, options) {
       branchBindings,
       currentBranch: resolvedBranch,
       defaultBranch: normalizeBranchName(file.defaultBranch),
-      legacyProjectId
+      legacyProjectId: explicitRootBinding?.projectId ?? legacyProjectId
     });
+    const resolvedBinding = buildResolvedBinding({
+      fallbackProjectId,
+      repoFingerprint: file.repoFingerprint ?? null,
+      remoteUrl: file.remoteUrl ?? null,
+      defaultBranch: file.defaultBranch ?? null,
+      branchName: resolvedBranch,
+      binding: resolvedBranch ? branchBindings[resolvedBranch] ?? null : null
+    }) ?? (resolvedBranch && resolvedBranch === normalizeBranchName(file.defaultBranch) && explicitRootBinding ? buildResolvedBinding({
+      fallbackProjectId,
+      repoFingerprint: file.repoFingerprint ?? null,
+      remoteUrl: file.remoteUrl ?? null,
+      defaultBranch: file.defaultBranch ?? null,
+      branchName: normalizeBranchName(file.defaultBranch),
+      binding: explicitRootBinding
+    }) : null);
     return {
       schemaVersion: parsed.schemaVersion,
       projectId: fallbackProjectId,
@@ -7952,14 +7991,15 @@ async function readCollabBindingState(repoRoot, options) {
       defaultBranch: file.defaultBranch ?? null,
       currentBranch,
       branchBindings,
-      binding: buildResolvedBinding({
+      explicitRootBinding: buildResolvedBinding({
         fallbackProjectId,
         repoFingerprint: file.repoFingerprint ?? null,
         remoteUrl: file.remoteUrl ?? null,
         defaultBranch: file.defaultBranch ?? null,
-        branchName: resolvedBranch,
-        binding: resolvedBranch ? branchBindings[resolvedBranch] ?? null : null
-      })
+        branchName: normalizeBranchName(file.defaultBranch),
+        binding: explicitRootBinding
+      }),
+      binding: resolvedBinding
     };
   } catch {
     return null;
@@ -7994,11 +8034,6 @@ function extractToolInput(payload) {
 function extractToolResponse(payload) {
   return getNestedRecord(payload.tool_response) ?? getNestedRecord(payload.toolResponse);
 }
-function extractToolStructuredData(payload) {
-  const toolResponse = extractToolResponse(payload);
-  const structuredContent = getNestedRecord(toolResponse?.structuredContent) ?? getNestedRecord(payload.structuredContent);
-  return getNestedRecord(toolResponse?.data) ?? getNestedRecord(structuredContent?.data) ?? structuredContent;
-}
 function extractToolName(payload) {
   return extractString(payload, ["tool_name", "toolName"]);
 }
@@ -8012,26 +8047,6 @@ function normalizeHookToolName(toolName) {
   }
   return trimmed;
 }
-function extractAssistantResponse(payload) {
-  const candidateKeys = [
-    "last_assistant_message",
-    "lastAssistantMessage",
-    "assistant_response",
-    "assistantResponse",
-    "assistant_message",
-    "assistantMessage",
-    "response",
-    "message"
-  ];
-  return extractString(payload, candidateKeys) ?? extractString(extractToolResponse(payload) ?? {}, candidateKeys) ?? extractString(extractToolStructuredData(payload) ?? {}, candidateKeys) ?? extractString(extractToolInput(payload), candidateKeys);
-}
-function extractFinalizeTurnMode(payload) {
-  const mode = extractString(extractToolStructuredData(payload) ?? {}, ["mode"]) ?? extractString(extractToolResponse(payload) ?? {}, ["mode"]) ?? extractString(payload, ["mode"]);
-  if (mode === "changed_turn" || mode === "no_diff_turn") {
-    return mode;
-  }
-  return null;
-}
 function extractString(input, keys) {
   for (const key of keys) {
     const value = input[key];
@@ -8083,9 +8098,6 @@ function didToolSucceed(payload) {
   const hookEventName = extractString(payload, ["hook_event_name", "hookEventName"]);
   return hookEventName === "PostToolUse";
 }
-function isRemoteChangeRecordedButLocalSyncFailed(payload) {
-  return extractToolErrorMessage(payload) === "Change step succeeded remotely, but automatic local sync failed.";
-}
 function collectStringPathValue(value) {
   if (typeof value === "string" && value.trim()) return [value.trim()];
   if (Array.isArray(value)) {
@@ -8150,7 +8162,7 @@ async function resolveBoundRepoFromToolCwd(payload) {
 
 // src/hook-post-collab.ts
 function isRepoMutationToolName(toolName) {
-  return /remix_collab_(add|add_change_step|sync_apply|approve_and_sync_target|sync_upstream|reconcile_apply)$/i.test(toolName);
+  return /remix_collab_(sync_apply|approve_and_sync_target|sync_upstream|reconcile_apply)$/i.test(toolName);
 }
 function isMemoryToolName(toolName) {
   return /remix_collab_memory_(summary|search|timeline|change_step_diff)$/i.test(toolName);
@@ -8164,31 +8176,12 @@ function isStructuredLocalReadToolName(toolName) {
 function isShellToolName(toolName) {
   return /^Bash$/i.test(toolName);
 }
-function isRemoteChangeRecordingToolName(toolName) {
-  return /remix_collab_(add|add_change_step)$/i.test(toolName);
-}
-function hasManualFullTurnPayload(payload) {
-  const toolInput = extractToolInput(payload);
-  return Boolean(extractString(toolInput, ["prompt"]) && extractAssistantResponse(payload));
-}
-function getManualRecordingScope(payload, toolName) {
+function getManualRecordingScope(toolName) {
   if (/remix_collab_finalize_turn$/i.test(toolName)) {
     return "full_turn";
   }
-  if (/remix_collab_(add|add_change_step)$/i.test(toolName)) {
-    return hasManualFullTurnPayload(payload) ? "full_turn" : "change_step";
-  }
-  if (/remix_collab_(record_turn|record_no_diff_turn)$/i.test(toolName)) {
-    return "full_turn";
-  }
   return null;
 }
-function didFinalizeTurnRecordRemoteChange(payload, toolName) {
-  if (!/remix_collab_finalize_turn$/i.test(toolName)) {
-    return false;
-  }
-  return extractFinalizeTurnMode(payload) === "changed_turn";
-}
 function isLikelyMutatingShellCommand(command) {
   const normalized = command.trim().toLowerCase();
   if (!normalized) return false;
@@ -8254,7 +8247,6 @@ async function runHookPostCollab(payload) {
     return;
   }
   const toolSucceeded = didToolSucceed(payload);
-  const remoteChangeRecordedButSyncFailed = (isRemoteChangeRecordingToolName(toolName) || /remix_collab_finalize_turn$/i.test(toolName)) && isRemoteChangeRecordedButLocalSyncFailed(payload);
   await appendHookDiagnosticsEvent({
     hook: "PostToolUse",
     sessionId,
@@ -8263,7 +8255,6 @@ async function runHookPostCollab(payload) {
     toolName,
     fields: {
       toolSucceeded,
-      remoteChangeRecordedButSyncFailed,
       isMemoryTool: isMemoryToolName(toolName),
       isRepoMutationTool: isRepoMutationToolName(toolName),
       isShellTool: isShellToolName(toolName),
@@ -8271,7 +8262,7 @@ async function runHookPostCollab(payload) {
       isStructuredLocalReadTool: isStructuredLocalReadToolName(toolName)
     }
   });
-  if (!toolSucceeded && !remoteChangeRecordedButSyncFailed) {
+  if (!toolSucceeded) {
     await appendHookDiagnosticsEvent({
       hook: "PostToolUse",
       sessionId,
@@ -8292,7 +8283,7 @@ async function runHookPostCollab(payload) {
       toolName
     });
   }
-  const manualRecordingScope = getManualRecordingScope(payload, toolName);
+  const manualRecordingScope = getManualRecordingScope(toolName);
   if (isRepoMutationToolName(toolName) || manualRecordingScope) {
     const targetRepo = await resolveBoundRepoFromToolCwd(payload);
     if (targetRepo) {
@@ -8311,7 +8302,7 @@ async function runHookPostCollab(payload) {
         await markTouchedRepoManuallyRecorded(sessionId, targetRepo.repoRoot, {
           toolName,
           scope: manualRecordingScope,
-          remoteChangeRecorded: toolSucceeded ? isRemoteChangeRecordingToolName(toolName) || didFinalizeTurnRecordRemoteChange(payload, toolName) : remoteChangeRecordedButSyncFailed
+          remoteChangeRecorded: false
         });
       }
       await appendHookDiagnosticsEvent({
@@ -8323,8 +8314,7 @@ async function runHookPostCollab(payload) {
         repoRoot: targetRepo.repoRoot,
         fields: {
           hasObservedWrite: isRepoMutationToolName(toolName),
-          manualRecordingScope,
-          remoteChangeRecordedButSyncFailed
+          manualRecordingScope
         }
       });
     } else {