ac-framework 2.0.0 → 2.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ac-framework",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "description": "Agentic Coding Framework - Multi-assistant configuration system with OpenSpec workflows",
   "main": "src/index.js",
   "exports": {

package/src/agents/runtime.js

@@ -43,6 +43,14 @@ function runCommand(command, args, options = {}) {
   });
 }
 
+function sleep(ms) {
+  return new Promise((resolvePromise) => setTimeout(resolvePromise, ms));
+}
+
+function stripAnsi(text) {
+  return String(text || '').replace(/\x1B\[[0-9;]*m/g, '');
+}
+
 function workerCommand(sessionId, role, roleLog) {
   return `bash -lc 'node "${runnerPath}" agents worker --session ${sessionId} --role ${role} 2>&1 | tee -a "${roleLog}"'`;
 }
@@ -91,26 +99,26 @@ export async function tmuxSessionExists(sessionName) {
 }
 
 async function writeZellijLayout({ layoutPath, sessionId, sessionDir }) {
-  const panes = COLLAB_ROLES.map((role) => {
+  const paneNode = (role) => {
     const roleLog = roleLogPath(sessionDir, role);
     const cmd = workerCommand(sessionId, role, roleLog).replace(/"/g, '\\"');
-    return `                    pane name="${role}" command="bash" args { "-lc" "${cmd}" }`;
-  });
+    return [
+      `                    pane name="${role}" command="bash" {`,
+      `                        args "-lc" "${cmd}"`,
+      '                    }',
+    ].join('\n');
+  };
 
   const content = [
     'layout {',
-    '    default_tab_template {',
-    '        tab name="SynapseGrid" {',
-    '            pane split_direction="vertical" {',
-    '                pane split_direction="horizontal" {',
-    panes[0],
-    panes[1],
-    '                }',
-    '                pane split_direction="horizontal" {',
-    panes[2],
-    panes[3],
-    '                }',
-    '            }',
+    '    pane split_direction="vertical" {',
+    '        pane split_direction="horizontal" {',
+    paneNode(COLLAB_ROLES[0]),
+    paneNode(COLLAB_ROLES[1]),
+    '        }',
+    '        pane split_direction="horizontal" {',
+    paneNode(COLLAB_ROLES[2]),
+    paneNode(COLLAB_ROLES[3]),
     '        }',
     '    }',
     '}',
@@ -120,19 +128,55 @@ async function writeZellijLayout({ layoutPath, sessionId, sessionDir }) {
   await writeFile(layoutPath, content, 'utf8');
 }
 
-export async function spawnZellijSession({ sessionName, sessionDir, sessionId, binaryPath }) {
+export async function spawnZellijSession({
+  sessionName,
+  sessionDir,
+  sessionId,
+  binaryPath,
+  waitForSessionMs = 10000,
+  pollIntervalMs = 250,
+  runCommandImpl,
+}) {
   const layoutPath = resolve(sessionDir, 'synapsegrid-layout.kdl');
   await writeZellijLayout({ layoutPath, sessionId, sessionDir });
   const command = binaryPath || process.env.ACFM_ZELLIJ_BIN || 'zellij';
-  await runCommand(command, ['--session', sessionName, '--layout', layoutPath, '--detach']);
-  return { layoutPath };
+  const runner = runCommandImpl || runCommand;
+
+  const existing = await zellijSessionExists(sessionName, binaryPath, { runCommandImpl: runner });
+  if (existing) {
+    return { layoutPath };
+  }
+
+  await runner(command, ['--layout', layoutPath, 'attach', '--create-background', sessionName], {
+    cwd: sessionDir,
+  });
+
+  const startedAt = Date.now();
+  while ((Date.now() - startedAt) < waitForSessionMs) {
+    // eslint-disable-next-line no-await-in-loop
+    const exists = await zellijSessionExists(sessionName, binaryPath, { runCommandImpl: runner });
+    if (exists) {
+      return { layoutPath };
+    }
+    // eslint-disable-next-line no-await-in-loop
+    await sleep(pollIntervalMs);
+  }
+
+  throw new Error(
+    `Timed out waiting for zellij session '${sessionName}' to start (binary: ${command}). ` +
+    'Try `acfm agents doctor` or fallback with `acfm agents start --mux tmux ...`'
+  );
 }
 
-export async function zellijSessionExists(sessionName, binaryPath) {
+export async function zellijSessionExists(sessionName, binaryPath, options = {}) {
   try {
+    const runner = options.runCommandImpl || runCommand;
     const command = binaryPath || process.env.ACFM_ZELLIJ_BIN || 'zellij';
-    const result = await runCommand(command, ['list-sessions']);
-    const lines = result.stdout.split('\n').map((line) => line.trim()).filter(Boolean);
+    const result = await runner(command, ['list-sessions']);
+    const lines = stripAnsi(result.stdout)
+      .split('\n')
+      .map((line) => line.trim())
+      .filter(Boolean);
     return lines.some((line) => line === sessionName || line.startsWith(`${sessionName} `));
   } catch {
     return false;

package/src/commands/agents.js

@@ -1503,7 +1503,15 @@ Examples:
           try {
             await runZellij(['delete-session', muxSessionName], { binaryPath: zellijPath });
           } catch {
-            // ignore if already closed
+            try {
+              await runZellij(['kill-session', muxSessionName], { binaryPath: zellijPath });
+            } catch {
+              try {
+                await runZellij(['delete-session', '--force', muxSessionName], { binaryPath: zellijPath });
+              } catch {
+                // ignore if already closed
+              }
+            }
           }
         }
         if (multiplexer === 'tmux' && muxSessionName && hasCommand('tmux')) {