vibe-coding-master 0.7.22 → 0.7.23

package/dist/backend/server.js

@@ -393,8 +393,7 @@ export function createDefaultServerDeps(options = {}) {
     const turnReconciler = createTurnReconcilerService({
         sessionService,
         roundService,
-        claudeHookService,
-        runtime
+        claudeHookService
     });
     const runtimeCoordinator = createRuntimeCoordinatorService({
         appSettings,

package/dist/backend/services/claude-transcript-reply.js

@@ -42,7 +42,8 @@ export async function readTranscriptTextEvents(transcriptPath) {
                     id: event.id,
                     timestamp: event.timestamp,
                     text: event.text,
-                    stopReason: event.stopReason
+                    stopReason: event.stopReason,
+                    ...(event.isSidechain ? { isSidechain: true } : {})
                 });
             }
         }
@@ -56,12 +57,10 @@ export async function readTranscriptTurnEvidence(session) {
         return {};
     }
     let raw;
-    let modifiedAt;
     let handle;
     try {
         handle = await open(transcriptPath, "r");
         const metadata = await handle.stat();
-        modifiedAt = metadata.mtime.toISOString();
         const readLength = Math.min(metadata.size, TRANSCRIPT_EVIDENCE_TAIL_BYTES);
         const readOffset = Math.max(0, metadata.size - readLength);
         const buffer = Buffer.alloc(readLength);
@@ -79,7 +78,6 @@ export async function readTranscriptTurnEvidence(session) {
         await handle?.close().catch(() => undefined);
     }
     const turnStartedAtMs = timestampMs(session.lastTurnStartedAt);
-    let lastActivityAt;
     let completion;
     for (const line of raw.split("\n")) {
         if (!line.trim()) {
@@ -93,10 +91,7 @@ export async function readTranscriptTurnEvidence(session) {
             continue;
         }
         const timestamp = typeof record.timestamp === "string" ? record.timestamp : undefined;
-        if (timestamp && isLaterTimestamp(timestamp, lastActivityAt)) {
-            lastActivityAt = timestamp;
-        }
-        if (record.type !== "assistant" || !timestamp) {
+        if (record.type !== "assistant" || record.isSidechain === true || !timestamp) {
             continue;
         }
         const message = record.message;
@@ -115,13 +110,7 @@ export async function readTranscriptTurnEvidence(session) {
             };
         }
     }
-    if (isLaterTimestamp(modifiedAt, lastActivityAt)) {
-        lastActivityAt = modifiedAt;
-    }
-    return {
-        ...(lastActivityAt ? { lastActivityAt } : {}),
-        ...(completion ? { completion } : {})
-    };
+    return completion ? { completion } : {};
 }
 /** True for a text event that completed a turn (assistant stopped of its own accord). */
 export function isFinalTurnTextEvent(event) {
@@ -138,7 +127,7 @@ export function selectLatestTurnReply(events, session, maxLength = MAX_TURN_REPL
     }
     const startMs = timestampMs(session.lastTurnStartedAt);
     const endMs = timestampMs(session.lastTurnEndedAt);
-    const finalEvents = events.filter(isFinalTurnTextEvent);
+    const finalEvents = events.filter((event) => !event.isSidechain && isFinalTurnTextEvent(event));
     const selected = startMs === undefined
         ? finalEvents.slice(-1)
         : finalEvents.filter((event) => {

package/dist/backend/services/claude-transcript-service.js

@@ -1,6 +1,6 @@
 import { closeSync, existsSync, openSync, readdirSync, readFileSync, readSync, statSync, watch as fsWatch } from "node:fs";
 import { homedir } from "node:os";
-import { join } from "node:path";
+import { basename, join } from "node:path";
 const DEFAULT_TAIL_POLL_INTERVAL_MS = 1000;
 /**
  * Adapted from CodingForMoney/cc-pm's transcript tailer.
@@ -204,7 +204,9 @@ export function createClaudeTranscriptService() {
     };
 }
 export function resolveExistingClaudeTranscriptPath(session) {
-    const sessionPath = existingFile(session.transcriptPath);
+    const sessionPath = transcriptPathMatchesSession(session.transcriptPath, session.claudeSessionId)
+        ? existingFile(session.transcriptPath)
+        : undefined;
     if (sessionPath) {
         return sessionPath;
     }
@@ -214,6 +216,11 @@ export function resolveExistingClaudeTranscriptPath(session) {
     }
     return findClaudeTranscriptPathBySessionId(session.claudeSessionId, session.claudeConfigDir);
 }
+function transcriptPathMatchesSession(transcriptPath, claudeSessionId) {
+    return Boolean(transcriptPath
+        && (!claudeSessionId
+            || basename(transcriptPath) === `${claudeSessionId}.jsonl`));
+}
 export function findClaudeTranscriptPathBySessionId(claudeSessionId, configDir) {
     const root = claudeProjectsRoot(configDir);
     let projectDirs;
@@ -296,6 +303,7 @@ export function parseAssistantContent(line) {
     const rawTools = [];
     const timestamp = typeof obj.timestamp === "string" ? obj.timestamp : new Date().toISOString();
     const uuid = typeof obj.uuid === "string" ? obj.uuid : undefined;
+    const isSidechain = obj.isSidechain === true;
     const rawStopReason = message?.stop_reason;
     const stopReason = typeof rawStopReason === "string" ? rawStopReason : undefined;
     for (const entry of content) {
@@ -352,6 +360,7 @@ export function parseAssistantContent(line) {
             timestamp,
             text,
             id: uuid ?? `${timestamp}-${text.slice(0, 16)}`,
+            ...(isSidechain ? { isSidechain: true } : {}),
             ...(stopReason !== undefined ? { stopReason } : {})
         });
     }
@@ -362,6 +371,7 @@ export function parseAssistantContent(line) {
             timestamp,
             text,
             id: uuid ? `${uuid}#thinking` : `${timestamp}-thinking-${text.slice(0, 16)}`,
+            ...(isSidechain ? { isSidechain: true } : {}),
             ...(stopReason !== undefined ? { stopReason } : {})
         });
     }
@@ -370,6 +380,7 @@ export function parseAssistantContent(line) {
             kind: "question",
             timestamp,
             id: question.id,
+            ...(isSidechain ? { isSidechain: true } : {}),
             question: question.payload
         });
     }
@@ -378,6 +389,7 @@ export function parseAssistantContent(line) {
             kind: "todo",
             timestamp,
             id: todo.id,
+            ...(isSidechain ? { isSidechain: true } : {}),
             todo: todo.payload
         });
     }
@@ -386,6 +398,7 @@ export function parseAssistantContent(line) {
             kind: "agent",
             timestamp,
             id: agent.id,
+            ...(isSidechain ? { isSidechain: true } : {}),
             agent: agent.payload
         });
     }
@@ -394,6 +407,7 @@ export function parseAssistantContent(line) {
             kind: "tool_use",
             timestamp,
             id: tool.id,
+            ...(isSidechain ? { isSidechain: true } : {}),
             toolUse: tool.payload
         });
     }
@@ -406,6 +420,7 @@ function parseUserToolResults(obj) {
         return [];
     }
     const timestamp = typeof obj.timestamp === "string" ? obj.timestamp : new Date().toISOString();
+    const isSidechain = obj.isSidechain === true;
     const out = [];
     for (const entry of content) {
         if (!entry || typeof entry !== "object") {
@@ -423,6 +438,7 @@ function parseUserToolResults(obj) {
             kind: "tool_result",
             timestamp,
             id: `${toolUseId}#result`,
+            ...(isSidechain ? { isSidechain: true } : {}),
             toolResult: {
                 tool_use_id: toolUseId,
                 content: block.content,

package/dist/backend/services/session-service.js

@@ -1172,16 +1172,17 @@ function toRoleSessionRecordView(record, runtime) {
     };
 }
 export function matchesRoleHookSession(record, input) {
+    if (input.runtimeSessionId) {
+        return record.id === input.runtimeSessionId;
+    }
     if (!record.claudeSessionId
         && !record.transcriptPath
         && input.eventName !== "UserPromptSubmit") {
         return false;
     }
-    if (input.runtimeSessionId) {
-        return record.id === input.runtimeSessionId;
-    }
-    if (record.runtimeSessionToken) {
-        return record.runtimeSessionToken === input.runtimeSessionToken;
+    if (record.runtimeSessionToken
+        && record.runtimeSessionToken !== input.runtimeSessionToken) {
+        return false;
     }
     if (!record.claudeSessionId && !record.transcriptPath) {
         return input.eventName === "UserPromptSubmit";
@@ -1189,7 +1190,9 @@ export function matchesRoleHookSession(record, input) {
     if (input.sessionId && record.claudeSessionId === input.sessionId) {
         return true;
     }
-    if (input.transcriptPath && record.transcriptPath === input.transcriptPath) {
+    if (input.transcriptPath
+        && record.transcriptPath
+        && samePath(record.transcriptPath, input.transcriptPath)) {
         return true;
     }
     return false;

package/dist/backend/services/turn-reconciler-service.js

@@ -1,13 +1,7 @@
 import { readTranscriptTurnEvidence } from "./claude-transcript-reply.js";
 import { getTaskRuntimeRepoRoot } from "./task-service.js";
-export const TURN_STALL_THRESHOLD_MS = 30 * 60_000;
-export const TURN_INTERRUPT_GRACE_MS = 10_000;
 export function createTurnReconcilerService(deps) {
-    const now = deps.now ?? (() => new Date().toISOString());
-    const stallThresholdMs = deps.stallThresholdMs ?? TURN_STALL_THRESHOLD_MS;
-    const interruptGraceMs = deps.interruptGraceMs ?? TURN_INTERRUPT_GRACE_MS;
     const readEvidence = deps.readTranscriptEvidence ?? readTranscriptTurnEvidence;
-    const pendingInterrupts = new Map();
     return {
         async reconcileTask(repoRoot, task, stateRoot) {
             const taskRepoRoot = getTaskRuntimeRepoRoot(task);
@@ -21,17 +15,14 @@ export function createTurnReconcilerService(deps) {
                 || !round.activeRole
                 || !round.activeTurnStartedAt
                 || round.roleRecovery) {
-                clearTaskInterrupts(repoRoot, task.taskSlug);
                 return { status: "inactive" };
             }
             const role = round.activeRole;
-            const interruptKey = `${repoRoot}:${task.taskSlug}:${role}`;
             const session = await deps.sessionService.getRoleSession(repoRoot, task.taskSlug, role);
             const evidence = session
                 ? await readEvidence({ ...session, lastTurnStartedAt: round.activeTurnStartedAt })
                 : {};
             if (evidence.completion) {
-                pendingInterrupts.delete(interruptKey);
                 await deps.claudeHookService.handleReconciledTurnEnd(buildReconciledHook(task.taskSlug, role, session, "Stop", {
                     vcm_reconcile_reason: "transcript-end-turn",
                     vcm_completion_id: evidence.completion.id,
@@ -40,7 +31,6 @@ export function createTurnReconcilerService(deps) {
                 return { status: "completed", role, reason: "transcript-end-turn" };
             }
             if (!session || session.status !== "running") {
-                pendingInterrupts.delete(interruptKey);
                 const reason = session ? "terminal-session-exited" : "terminal-session-missing";
                 await deps.claudeHookService.handleReconciledTurnEnd(buildReconciledHook(task.taskSlug, role, session, "StopFailure", {
                     error: reason.replaceAll("-", "_"),
@@ -48,44 +38,9 @@ export function createTurnReconcilerService(deps) {
                 }));
                 return { status: "failed", role, reason };
             }
-            const lastActivityAt = latestTimestamp([
-                round.activeTurnStartedAt,
-                session.lastHookEventAt,
-                session.lastOutputAt,
-                evidence.lastActivityAt
-            ]);
-            const currentTime = now();
-            if (!isStale(lastActivityAt, currentTime, stallThresholdMs)) {
-                pendingInterrupts.delete(interruptKey);
-                return { status: "active" };
-            }
-            const pendingInterrupt = pendingInterrupts.get(interruptKey);
-            if (!pendingInterrupt || pendingInterrupt.turnStartedAt !== round.activeTurnStartedAt) {
-                deps.runtime.write(session.id, "\u0003");
-                pendingInterrupts.set(interruptKey, {
-                    turnStartedAt: round.activeTurnStartedAt,
-                    requestedAt: currentTime
-                });
-                return { status: "active" };
-            }
-            if (!isStale(pendingInterrupt.requestedAt, currentTime, interruptGraceMs)) {
-                return { status: "active" };
-            }
-            pendingInterrupts.delete(interruptKey);
-            await deps.claudeHookService.handleReconciledTurnEnd(buildReconciledHook(task.taskSlug, role, session, "StopFailure", {
-                error: "turn_stalled",
-                error_details: `No hook, terminal output, or transcript activity was observed for ${stallThresholdMs}ms.`
-            }));
-            return { status: "failed", role, reason: "turn-stalled" };
+            return { status: "active" };
         }
     };
-    function clearTaskInterrupts(repoRoot, taskSlug) {
-        for (const key of pendingInterrupts.keys()) {
-            if (key.startsWith(`${repoRoot}:${taskSlug}:`)) {
-                pendingInterrupts.delete(key);
-            }
-        }
-    }
 }
 function buildReconciledHook(taskSlug, role, session, eventName, evidence) {
     return {
@@ -102,22 +57,3 @@ function buildReconciledHook(taskSlug, role, session, eventName, evidence) {
         }
     };
 }
-function latestTimestamp(values) {
-    return values.reduce((latest, value) => {
-        if (!value) {
-            return latest;
-        }
-        const valueMs = Date.parse(value);
-        const latestMs = latest ? Date.parse(latest) : Number.NaN;
-        return Number.isFinite(valueMs) && (!Number.isFinite(latestMs) || valueMs > latestMs)
-            ? value
-            : latest;
-    }, undefined);
-}
-function isStale(lastActivityAt, currentTime, thresholdMs) {
-    const activityMs = lastActivityAt ? Date.parse(lastActivityAt) : Number.NaN;
-    const currentMs = Date.parse(currentTime);
-    return Number.isFinite(activityMs)
-        && Number.isFinite(currentMs)
-        && currentMs - activityMs >= thresholdMs;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vibe-coding-master",
-  "version": "0.7.22",
+  "version": "0.7.23",
   "description": "Local GUI session cockpit for Claude Code role sessions.",
   "type": "module",
   "files": [