snipara-companion 1.4.2 → 1.4.3

package/dist/index.js

@@ -11075,7 +11075,12 @@ function loadCollaborationState(rootDir = process.cwd()) {
   if (!fs16.existsSync(statePath)) {
     return createEmptyCollaborationState();
   }
-  const parsed = JSON.parse(fs16.readFileSync(statePath, "utf8"));
+  let parsed;
+  try {
+    parsed = JSON.parse(fs16.readFileSync(statePath, "utf8"));
+  } catch {
+    return createEmptyCollaborationState();
+  }
   return {
     schemaVersion: "snipara.collaboration.v1",
     updatedAt: typeof parsed.updatedAt === "string" ? parsed.updatedAt : (/* @__PURE__ */ new Date()).toISOString(),
@@ -11098,8 +11103,16 @@ function loadCollaborationState(rootDir = process.cwd()) {
 function saveCollaborationState(state, rootDir = process.cwd()) {
   const statePath = getCollaborationStatePath(rootDir);
   fs16.mkdirSync(path15.dirname(statePath), { recursive: true });
-  fs16.writeFileSync(statePath, `${JSON.stringify(state, null, 2)}
+  const tempPath = `${statePath}.${process.pid}.${Date.now()}.tmp`;
+  try {
+    fs16.writeFileSync(tempPath, `${JSON.stringify(state, null, 2)}
 `, "utf8");
+    fs16.renameSync(tempPath, statePath);
+  } finally {
+    if (fs16.existsSync(tempPath)) {
+      fs16.unlinkSync(tempPath);
+    }
+  }
 }
 function buildCollaborationActor(options, config) {
   const username = safeUsername();
@@ -11905,13 +11918,27 @@ function deriveContextResources(context) {
   return resources;
 }
 function readGitDirtyFiles(rootDir) {
-  const status = readGitValue3(rootDir, ["status", "--short"]);
+  const status = readGitRawValue(rootDir, ["status", "--porcelain=v1", "-z"]);
   if (!status) {
     return [];
   }
-  return normalizeFiles2(
-    status.split(/\r?\n/).map((line) => line.slice(3).trim()).map((file) => file.split(" -> ").pop() ?? file)
-  );
+  return normalizeFiles2(parseGitPorcelainZ(status));
+}
+function parseGitPorcelainZ(output) {
+  const entries = output.split("\0").filter(Boolean);
+  const files = [];
+  for (let index = 0; index < entries.length; index += 1) {
+    const entry = entries[index];
+    if (entry.length < 4) {
+      continue;
+    }
+    const status = entry.slice(0, 2);
+    files.push(entry.slice(3));
+    if (status.includes("R") || status.includes("C")) {
+      index += 1;
+    }
+  }
+  return files;
 }
 function deriveNextRouteResource(filePath) {
   const appRouterMatch = filePath.match(
@@ -12015,6 +12042,10 @@ function readRepositoryId(rootDir) {
   return remote;
 }
 function readGitValue3(rootDir, args) {
+  const output = readGitRawValue(rootDir, args);
+  return output?.trim() || void 0;
+}
+function readGitRawValue(rootDir, args) {
   try {
     const execOptions = {
       cwd: rootDir,
@@ -12022,7 +12053,7 @@ function readGitValue3(rootDir, args) {
       stdio: ["ignore", "pipe", "ignore"],
       timeout: 1e3
     };
-    const output = (0, import_node_child_process4.execFileSync)("git", args, execOptions).trim();
+    const output = (0, import_node_child_process4.execFileSync)("git", args, execOptions);
     return output || void 0;
   } catch {
     return void 0;
@@ -12036,8 +12067,15 @@ function buildCollaborationGitHookBlock(hookName) {
   return [
     collaborationHookBlockMarker(hookName, "start"),
     "# Block unsafe parallel edits before code leaves the local worktree.",
-    "if command -v snipara-companion >/dev/null 2>&1; then",
+    'if [ "${SNIPARA_COLLABORATION_GUARD:-1}" = "0" ]; then',
+    '  echo "Snipara collaboration guard bypassed by SNIPARA_COLLABORATION_GUARD=0" >&2',
+    "elif command -v snipara-companion >/dev/null 2>&1; then",
     `  snipara-companion collaboration guard --profile ${profile} --action ${profile} --enforce --json >/dev/null`,
+    "elif command -v npx >/dev/null 2>&1; then",
+    `  npx --yes snipara-companion@latest collaboration guard --profile ${profile} --action ${profile} --enforce --json >/dev/null`,
+    "else",
+    '  echo "snipara-companion is required for the Snipara collaboration guard. Install it or set SNIPARA_COLLABORATION_GUARD=0 for an explicit emergency bypass." >&2',
+    "  exit 1",
     "fi",
     collaborationHookBlockMarker(hookName, "end")
   ].join("\n");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "snipara-companion",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "Snipara Git-style companion CLI for hosted context, agent continuity, hooks, and automation workflows",
   "main": "dist/index.js",
   "bin": {