@canonmsg/core 0.7.1 → 0.7.2

package/dist/execution-environment.js

@@ -1,8 +1,8 @@
 import { spawnSync } from 'node:child_process';
 import { createHash } from 'node:crypto';
-import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync, } from 'node:fs';
+import { existsSync, mkdirSync, unlinkSync, writeFileSync, } from 'node:fs';
 import { basename, dirname, join, relative, resolve } from 'node:path';
-import { CANON_DIR, isProcessAlive } from './agent-profiles.js';
+import { CANON_DIR } from './agent-profiles.js';
 import { EXECUTION_ENVIRONMENT_MODES, isExecutionEnvironmentMode, } from './execution-environment-mode.js';
 export { EXECUTION_ENVIRONMENT_MODES, isExecutionEnvironmentMode };
 export class ExecutionEnvironmentError extends Error {
@@ -56,46 +56,19 @@ function detectRepoRoot(cwd) {
     const repoRoot = result.stdout.trim();
     return repoRoot ? resolve(repoRoot) : null;
 }
-function isRepoClean(repoRoot) {
-    const result = runGit(repoRoot, ['status', '--porcelain']);
-    return result.ok && result.stdout.trim() === '';
-}
 function branchExists(repoRoot, branch) {
     return runGit(repoRoot, ['show-ref', '--verify', '--quiet', `refs/heads/${branch}`]).ok;
 }
-function loadWorkspaceLock(lockPath) {
-    try {
-        return JSON.parse(readFileSync(lockPath, 'utf-8'));
-    }
-    catch {
-        return null;
-    }
-}
-function cleanupStaleWorkspaceLock(lockPath) {
-    const record = loadWorkspaceLock(lockPath);
-    if (!record) {
-        try {
-            unlinkSync(lockPath);
-            return true;
-        }
-        catch {
-            return false;
-        }
-    }
-    if (isProcessAlive(record.pid))
-        return false;
-    try {
-        unlinkSync(lockPath);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-function acquireWorkspaceLock(input) {
+// Advisory workspace-usage record. Multiple sessions may share a workspace;
+// we write per-session files (not per-workspace) so nothing contends. Treat
+// these as observability breadcrumbs, not exclusive locks — the name stays
+// for backward compat with existing tooling / docs.
+function recordWorkspaceUsage(input) {
     mkdirSync(WORKSPACE_LOCKS_ROOT, { recursive: true });
     const workspaceCwd = resolve(input.workspaceCwd);
-    const lockPath = join(WORKSPACE_LOCKS_ROOT, `${shortHash(workspaceCwd)}.json`);
+    const workspaceHash = shortHash(workspaceCwd);
+    const sessionHash = shortHash(`${input.agentId}:${input.conversationId}`).slice(0, 8);
+    const lockPath = join(WORKSPACE_LOCKS_ROOT, `${workspaceHash}.${sessionHash}.json`);
     const record = {
         pid: process.pid,
         agentId: input.agentId,
@@ -103,34 +76,13 @@ function acquireWorkspaceLock(input) {
         workspaceCwd,
         createdAt: new Date().toISOString(),
     };
-    while (true) {
-        try {
-            writeFileSync(lockPath, JSON.stringify(record, null, 2), { flag: 'wx' });
-            return lockPath;
-        }
-        catch (error) {
-            const code = error.code;
-            if (code !== 'EEXIST') {
-                throw error;
-            }
-            const existing = loadWorkspaceLock(lockPath);
-            if (!existing) {
-                if (cleanupStaleWorkspaceLock(lockPath))
-                    continue;
-                throw new Error(`Workspace lock file is unreadable: ${workspaceCwd}`);
-            }
-            if (!isProcessAlive(existing.pid)) {
-                if (cleanupStaleWorkspaceLock(lockPath))
-                    continue;
-            }
-            if (existing.pid === process.pid
-                && existing.agentId === input.agentId
-                && existing.conversationId === input.conversationId) {
-                return lockPath;
-            }
-            throw new ExecutionEnvironmentError(`Workspace is already in use by Canon session ${existing.conversationId.slice(0, 8)} (PID ${existing.pid}).`, 'That workspace is already in use by another Canon coding session on this machine.');
-        }
+    try {
+        writeFileSync(lockPath, JSON.stringify(record, null, 2));
+    }
+    catch {
+        // Best-effort; an unwritable breadcrumb must not block a session.
     }
+    return lockPath;
 }
 export function buildConversationEnvironmentKey(conversationId, workspaceCwd) {
     return `${conversationId}:${resolve(workspaceCwd)}`;
@@ -217,12 +169,12 @@ export function prepareConversationEnvironment(input) {
             cwd: baseCwd,
             baseCwd,
             mode: 'locked',
-            lockPath: acquireWorkspaceLock({
+            lockPath: recordWorkspaceUsage({
                 agentId: input.agentId,
                 conversationId: input.conversationId,
                 workspaceCwd: baseCwd,
             }),
-            reason: 'Worktree isolation is disabled for this host',
+            reason: 'Sharing the base workspace (locked mode)',
         };
     }
     const repoRoot = detectRepoRoot(baseCwd);
@@ -242,7 +194,11 @@ export function prepareConversationEnvironment(input) {
                 };
             }
         }
-        else if (isRepoClean(repoRoot)) {
+        else {
+            // `git worktree add` works fine even when the source worktree is dirty —
+            // uncommitted changes stay with the source tree, the new worktree is
+            // based on HEAD. Historically we required a clean repo and silently fell
+            // through to locked mode; that failure mode surprised users. Just try.
             mkdirSync(dirname(spec.worktreePath), { recursive: true });
             const addArgs = branchExists(repoRoot, spec.branch)
                 ? ['worktree', 'add', spec.worktreePath, spec.branch]
@@ -264,14 +220,14 @@ export function prepareConversationEnvironment(input) {
         cwd: baseCwd,
         baseCwd,
         mode: 'locked',
-        lockPath: acquireWorkspaceLock({
+        lockPath: recordWorkspaceUsage({
             agentId: input.agentId,
             conversationId: input.conversationId,
             workspaceCwd: baseCwd,
         }),
         reason: repoRoot
-            ? 'Base repository is dirty or worktree creation failed'
-            : 'Workspace is not a git repository',
+            ? 'Worktree creation failed; sharing the base workspace'
+            : 'Workspace is not a git repository; sharing the base workspace',
     };
 }
 export function releaseConversationEnvironment(environment) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/core",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "Canon core — shared types, REST client, SSE stream, and registration for Canon messaging",
   "type": "module",
   "main": "dist/index.js",