@aion0/forge 0.5.6 → 0.5.8

package/lib/session-utils.ts

@@ -0,0 +1,49 @@
+/**
+ * Shared session utilities for client-side components.
+ * Resolves fixedSessionId from project-level binding.
+ */
+
+/** Fetch the fixedSessionId for a project. If not set, auto-binds the latest session. */
+export async function resolveFixedSession(projectPath: string): Promise<string | null> {
+  try {
+    // Check existing binding
+    const res = await fetch(`/api/project-sessions?projectPath=${encodeURIComponent(projectPath)}`);
+    const data = await res.json();
+    if (data?.fixedSessionId) return data.fixedSessionId;
+
+    // Not set — find latest session and auto-bind
+    const projectName = projectPath.replace(/\/+$/, '').split('/').pop() || '';
+    const sessRes = await fetch(`/api/claude-sessions/${encodeURIComponent(projectName)}`);
+    const sessions = await sessRes.json();
+    if (!Array.isArray(sessions) || sessions.length === 0) return null;
+
+    const latestId = sessions[0].sessionId || sessions[0].id;
+    if (!latestId) return null;
+
+    // Save binding
+    await fetch('/api/project-sessions', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ projectPath, fixedSessionId: latestId }),
+    });
+
+    return latestId;
+  } catch {
+    return null;
+  }
+}
+
+/** Build the resume flag: --resume <id> if fixedSession exists, else -c if hasSession */
+export function buildResumeFlag(fixedSessionId: string | null, hasExistingSessions: boolean): string {
+  if (fixedSessionId) return ` --resume ${fixedSessionId}`;
+  if (hasExistingSessions) return ' -c';
+  return '';
+}
+
+/** Get --mcp-config flag for claude-code. Triggers server-side mcp.json creation. */
+export async function getMcpFlag(projectPath: string): Promise<string> {
+  // Ensure .forge/mcp.json exists (server generates it)
+  await fetch(`/api/project-sessions?projectPath=${encodeURIComponent(projectPath)}`).catch(() => {});
+  return ` --mcp-config "${projectPath}/.forge/mcp.json"`;
+}
+

package/lib/workspace/__tests__/state-machine.test.ts

@@ -87,7 +87,7 @@ async function runAll() {
     const s = getState(orch, 'a1');
     ok(s.smithStatus === 'down', `smithStatus = down (got ${s.smithStatus})`);
     ok(s.taskStatus === 'idle', `taskStatus = idle (got ${s.taskStatus})`);
-    ok(s.mode === 'auto', `mode = auto (got ${s.mode})`);
+    // mode field removed — execution method determined by tmuxSession presence
   });
 
   // Test 2: startDaemon sets all smiths to active
@@ -148,7 +148,7 @@ async function runAll() {
       }],
       agentStates: {
         'a1': {
-          smithStatus: 'active', mode: 'auto', taskStatus: 'running',
+          smithStatus: 'active', taskStatus: 'running',
           history: [], artifacts: [],
         } as AgentState,
       },

package/lib/workspace/agent-worker.ts

@@ -14,7 +14,6 @@ import type {
   AgentState,
   TaskStatus,
   SmithStatus,
-  AgentMode,
   AgentBackend,
   WorkerEvent,
   Artifact,
@@ -91,7 +90,6 @@ export class AgentWorker extends EventEmitter {
     this.onMessageFailed = opts.onMessageFailed;
     this.state = {
       smithStatus: 'down',
-      mode: 'auto',
       taskStatus: opts.initialTaskStatus || 'idle',
       history: [],
       artifacts: [],
@@ -532,10 +530,9 @@ export class AgentWorker extends EventEmitter {
     this.emitEvent({ type: 'task_status', agentId: this.config.id, taskStatus, error });
   }
 
-  private setSmithStatus(smithStatus: SmithStatus, mode?: AgentMode): void {
+  private setSmithStatus(smithStatus: SmithStatus): void {
     this.state.smithStatus = smithStatus;
-    if (mode) this.state.mode = mode;
-    this.emitEvent({ type: 'smith_status', agentId: this.config.id, smithStatus, mode: this.state.mode });
+    this.emitEvent({ type: 'smith_status', agentId: this.config.id, smithStatus });
   }
 
   private emitEvent(event: WorkerEvent): void {

package/lib/workspace/backends/cli-backend.ts

@@ -115,6 +115,9 @@ export class CliBackend implements AgentBackend {
     // Use adapter to build spawn command (same as task-manager)
     // Model priority: workspace config > profile config > adapter default
     const effectiveModel = config.model || (adapter.config as any).model;
+    // Note: if no sessionId, each execution starts a new session (no resume).
+    // To maintain context, user can enable persistent terminal session per agent.
+
     const spawnOpts = adapter.buildTaskSpawn({
       projectPath,
       prompt,