snipara-companion 4.2.1 → 4.2.2

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 Release notes for `snipara-companion`, newest first.
 
+## 4.2.2
+
+- Propagate collaboration guard failures and run the pre-commit guard before mutating staged files.
+
 ## 4.2.1
 
 - Forward validation scope only to Sandbox commands that accept it, while preserving scoped coordinator runs.

package/dist/index.js

@@ -24106,9 +24106,11 @@ function loadCollaborationState(rootDir = process.cwd()) {
     schemaVersion: "snipara.collaboration.v1",
     updatedAt: typeof parsed.updatedAt === "string" ? parsed.updatedAt : (/* @__PURE__ */ new Date()).toISOString(),
     workSessionId: normalizeOptionalString3(parsed.workSessionId),
-    workflowSessions: Object.fromEntries(Object.entries(parsed.workflowSessions ?? {}).filter(
-      ([key, value]) => /^[a-f0-9]{64}$/.test(key) && typeof value === "string" && value.length > 0
-    )),
+    workflowSessions: Object.fromEntries(
+      Object.entries(parsed.workflowSessions ?? {}).filter(
+        ([key, value]) => /^[a-f0-9]{64}$/.test(key) && typeof value === "string" && value.length > 0
+      )
+    ),
     sessionId: normalizeOptionalString3(parsed.sessionId),
     actorId: normalizeOptionalString3(parsed.actorId),
     actorType: normalizeActorType(parsed.actorType),
@@ -24357,10 +24359,15 @@ async function workflowCollaborationStart(options) {
   const session = hostedSession.status === "ok" ? hostedSession.data?.session : void 0;
   const workSessionId = session?.id ?? persistedSessionId ?? logicalSessionId;
   if (session) {
-    state.workflowSessions = { ...state.workflowSessions, [sessionKey]: session.id };
+    state.workflowSessions = {
+      ...state.workflowSessions,
+      [sessionKey]: session.id
+    };
   }
   const effectiveResources = hostedSession.status === "ok" ? hostedSession.data?.resources ?? resources : resources;
-  let hostedClaim = { status: "skipped" };
+  let hostedClaim = {
+    status: "skipped"
+  };
   const shouldClaim = options.mode === "full" || options.mode === "orchestrate";
   if (hostedSession.status === "ok" && shouldClaim && (files.length > 0 || effectiveResources.length > 0)) {
     hostedClaim = await maybeCreateHostedLeases(context, {
@@ -24895,7 +24902,9 @@ async function runCollaborationWatchTick(context, state, options) {
   let heartbeatHosted = {
     status: "skipped"
   };
-  let claimHosted = { status: "skipped" };
+  let claimHosted = {
+    status: "skipped"
+  };
   let releaseHosted = {
     status: "skipped"
   };
@@ -24942,7 +24951,9 @@ async function runCollaborationWatchTick(context, state, options) {
       releaseHosted = await releaseHostedLeases(
         context,
         staleActiveLeases.map((lease) => lease.id),
-        { reason: "Released by collaboration watch because the resource is no longer active." }
+        {
+          reason: "Released by collaboration watch because the resource is no longer active."
+        }
       );
       const releasedIds = new Set(
         releaseHosted.status === "ok" ? (releaseHosted.data ?? []).map((item) => item.lease.id) : staleActiveLeases.map((lease) => lease.id)
@@ -25044,30 +25055,58 @@ function deriveGuardProfileResources(profile, files) {
   }
   if (profile === "pre-deploy") {
     resources.push(
-      { kind: "DEPLOY", id: "production-deployment", label: "Production deployment" },
-      { kind: "SURFACE", id: "deployment", label: "Deployment and infrastructure" }
+      {
+        kind: "DEPLOY",
+        id: "production-deployment",
+        label: "Production deployment"
+      },
+      {
+        kind: "SURFACE",
+        id: "deployment",
+        label: "Deployment and infrastructure"
+      }
     );
   }
   if (profile === "migration" || profile === "schema") {
     resources.push(
-      { kind: "SCHEMA", id: "prisma:tenant_snipara", label: "Prisma tenant_snipara schema" },
+      {
+        kind: "SCHEMA",
+        id: "prisma:tenant_snipara",
+        label: "Prisma tenant_snipara schema"
+      },
       { kind: "SURFACE", id: "database", label: "Database and schema" }
     );
   }
   if (profile === "release-package") {
-    resources.push({ kind: "SURFACE", id: "release-package", label: "Package release surface" });
+    resources.push({
+      kind: "SURFACE",
+      id: "release-package",
+      label: "Package release surface"
+    });
   }
   if (profile === "pre-commit" || profile === "pre-push") {
     if (files.some(isPrismaSchemaPath)) {
       resources.push(
-        { kind: "SCHEMA", id: "prisma:tenant_snipara", label: "Prisma tenant_snipara schema" },
+        {
+          kind: "SCHEMA",
+          id: "prisma:tenant_snipara",
+          label: "Prisma tenant_snipara schema"
+        },
         { kind: "SURFACE", id: "database", label: "Database and schema" }
       );
     }
     if (files.some(isDeploymentPath)) {
       resources.push(
-        { kind: "DEPLOY", id: "production-deployment", label: "Production deployment" },
-        { kind: "SURFACE", id: "deployment", label: "Deployment and infrastructure" }
+        {
+          kind: "DEPLOY",
+          id: "production-deployment",
+          label: "Production deployment"
+        },
+        {
+          kind: "SURFACE",
+          id: "deployment",
+          label: "Deployment and infrastructure"
+        }
       );
     }
     if (files.some((file) => file.endsWith("package.json") || file.includes("/package.json"))) {
@@ -25256,7 +25295,7 @@ function buildCollaborationGitHookBlock(hookName) {
   const profile = hookName === "pre-push" ? "pre-push" : "pre-commit";
   return [
     collaborationHookBlockMarker(hookName, "start"),
-    "# Atomically claim checkout git writes, then block unsafe parallel edits.",
+    profile === "pre-commit" ? "# Request a cooperative checkout lease before changing the index." : "# Atomically claim checkout git writes, then block unsafe parallel edits.",
     'if [ "${SNIPARA_COLLABORATION_GUARD:-1}" = "0" ]; then',
     '  echo "Snipara collaboration guard bypassed by SNIPARA_COLLABORATION_GUARD=0" >&2',
     "else",
@@ -25270,7 +25309,7 @@ function buildCollaborationGitHookBlock(hookName) {
     "      return 127",
     "    fi",
     "  }",
-    `  snipara_companion_hook collaboration claim --resource SURFACE:checkout-git-write --mode EXCLUSIVE --ttl-seconds 300 --reason "${profile} git write" --json >/dev/null || true`,
+    `  snipara_companion_hook collaboration claim --resource SURFACE:checkout-git-write --mode EXCLUSIVE --ttl-seconds 300 --reason "${profile} git write" --json >/dev/null || ${profile === "pre-commit" ? "exit $?" : "true"}`,
     "  snipara_companion_guard() {",
     `    snipara_companion_hook collaboration guard --profile ${profile} --action ${profile} --resource SURFACE:checkout-git-write --enforce "$@" --json >/dev/null`,
     "  }",
@@ -25287,7 +25326,7 @@ function buildCollaborationGitHookBlock(hookName) {
     "  else",
     "    snipara_companion_guard",
     "  fi",
-    "fi",
+    profile === "pre-commit" ? "fi || exit $?" : "fi",
     collaborationHookBlockMarker(hookName, "end")
   ].join("\n");
 }
@@ -25303,6 +25342,15 @@ function mergeManagedCollaborationHookBlock(hookName, currentContent, block) {
 ${base}`;
   const nextBlock = `${block}
 `;
+  if (hookName === "pre-commit") {
+    const newline = withShebang.indexOf("\n");
+    const shebang = newline < 0 ? withShebang : withShebang.slice(0, newline);
+    const body = newline < 0 ? "" : withShebang.slice(newline + 1);
+    return ensureTrailingNewline2(
+      `${shebang}
+${nextBlock}${body.replace(managedBlockPattern, "")}`
+    );
+  }
   if (managedBlockPattern.test(withShebang)) {
     return ensureTrailingNewline2(withShebang.replace(managedBlockPattern, nextBlock));
   }
@@ -25388,7 +25436,16 @@ function expireLocalLeases(state, now = /* @__PURE__ */ new Date()) {
   }
 }
 function workflowSessionKey(context, workflowId) {
-  return (0, import_node_crypto17.createHash)("sha256").update(JSON.stringify([context.config.apiUrl, context.config.projectId, context.actor.actorType, context.actor.actorId, context.worktree, workflowId])).digest("hex");
+  return (0, import_node_crypto17.createHash)("sha256").update(
+    JSON.stringify([
+      context.config.apiUrl,
+      context.config.projectId,
+      context.actor.actorType,
+      context.actor.actorId,
+      context.worktree,
+      workflowId
+    ])
+  ).digest("hex");
 }
 function workflowWorkSessionId(workflowId) {
   return `workflow:${workflowId}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "snipara-companion",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "Local-first CLI that asks your repo what breaks before an AI coding agent edits it.",
   "main": "dist/index.js",
   "bin": {