@veewo/claw 0.2.25 → 0.2.26

package/dist/cli.js

@@ -6,12 +6,11 @@ import { createInterface } from "node:readline";
 import { pathToFileURL } from "node:url";
 import { createHash } from "node:crypto";
 import { spawn, spawnSync } from "node:child_process";
-import { buildDirectWorkflowGuidance, appendKnowledgeTaskConclusions, buildKnowledgeAtomicDispatch, buildKnowledgeDelegateDispatch, buildKnowledgeAssignmentTemplate, buildDirectKnowledgeAssignments, buildKnowledgeWriterAssignments, DEFAULT_MAX_TASKS_TO_KEEP, checkProjectProtocol, ClawError, assertRootPlanCreateAllowedForPlan, buildPlanWorkflowGuidance, buildMemoryIndex, buildSessionStartDefaultPrompt, buildSessionStartRecoveredPrompt, editPlan, ensureProjectProtocol, enforceTaskRetention, findKnowledgeFinalizationJobPath, findTaskDirectory, runDailyMaintenance, ingestTruth, initProject, getTemplateTaskDoneChoices, resolvePlanTemplateFile, resolvePlanEffectiveConfig, resolveThreadGoalPlan, resolveKnowledgeWriterForHost, resolveProjectContext, resolveWorkflowProjectContext, resolveSessionWorkflowContext, deleteSessionWorkflow, sweepExpiredSessionWorkflows, resolveSessionBoundPlan, resolveContext, resolveSeedPlanTemplate, searchMemoryAsync, warmProjectMemoryEmbedding, showPlan, createSubplan, createPlanRef, switchTask, tryCaptureKnowledgeStop, claimKnowledgeFinalizationJob, doneKnowledgeFinalizationJob, readKnowledgeFinalizationJob, waitForKnowledgeFinalizationJobReady, listKnowledgeFinalizationJobs, listRetryableKnowledgeFinalizationJobs, normalizeTruthMarkdownEncoding, governKnowledgeMarkdownPaths, resolveKnowledgeDocUpdateSnapshot, recordKnowledgeFinalizationResult, unbindSession, writePlan, } from "@veewo/claw-core";
+import { buildDirectWorkflowGuidance, buildKnowledgeAtomicDispatch, buildKnowledgeDelegateDispatch, buildKnowledgeAssignmentTemplate, buildDirectKnowledgeAssignments, buildKnowledgeWriterAssignments, DEFAULT_MAX_TASKS_TO_KEEP, checkProjectProtocol, ClawError, assertRootPlanCreateAllowedForPlan, buildPlanWorkflowGuidance, buildMemoryIndex, buildSessionStartDefaultPrompt, buildSessionStartRecoveredPrompt, editPlan, ensureProjectProtocol, enforceTaskRetention, findKnowledgeFinalizationJobPath, findTaskDirectory, runDailyMaintenance, ingestTruth, initProject, getTemplateTaskDoneChoices, resolvePlanTemplateFile, resolvePlanEffectiveConfig, resolveThreadGoalPlan, resolveKnowledgeWriterForHost, resolveProjectContext, resolveWorkflowProjectContext, resolveSessionWorkflowContext, deleteSessionWorkflow, sweepExpiredSessionWorkflows, resolveSessionBoundPlan, resolveContext, resolveSeedPlanTemplate, searchMemoryAsync, warmProjectMemoryEmbedding, showPlan, createSubplan, createPlanRef, switchTask, tryCaptureKnowledgeStop, claimKnowledgeFinalizationJob, doneKnowledgeFinalizationJob, readKnowledgeFinalizationJob, waitForKnowledgeFinalizationJobReady, listKnowledgeFinalizationJobs, listRetryableKnowledgeFinalizationJobs, normalizeTruthMarkdownEncoding, governKnowledgeMarkdownPaths, resolveKnowledgeDocUpdateSnapshot, recordKnowledgeFinalizationResult, unbindSession, writePlan, } from "@veewo/claw-core";
 import { buildCodexDriverEnvelope } from "./codex-driver.js";
 import { buildCodexHostActions } from "./codex-host-actions.js";
 import { checkCodexRuntime, resolveCodexSdkEntryPath } from "./codex-runtime.js";
-import { extractLatestFinalAssistantMessage, extractTaskDoneConclusions, findCodexTranscriptPath, } from "./codex-transcript.js";
-import { readDshKnowledgeCapture } from "./dsh-capture.js";
+import { collectReport, registerReportCollector } from "./report-collector-registry.js";
 import { consumeBufferedHookInput } from "./knowledge-hook-preflight.js";
 import { isSubagentPolicyHost, resolveInvocationHost, withoutInvocationHost } from "./invocation-host.js";
 import { runOpencodeKnowledgeWriter } from "./opencode-runner.js";
@@ -564,6 +563,9 @@ async function main() {
             case "knowledge":
                 await runKnowledge(args);
                 return;
+            case "internal-report-collector-register":
+                runInternalReportCollectorRegister(args);
+                return;
             case "direct":
                 runDirect(args, effectiveHost);
                 return;
@@ -1013,34 +1015,18 @@ function serializeSessionError(error) {
     }
     return { code: "SESSION_COMMAND_FAILED", message: error instanceof Error ? error.message : String(error) };
 }
-function readCindyKnowledgeClaimCaptureInput() {
-    const raw = fs.readFileSync(0, "utf8").trim();
-    if (!raw) {
-        throw new ClawError("PROJECT_CONFIG_INVALID", "Cindy knowledge claim report input is empty.");
-    }
-    let parsed;
-    try {
-        parsed = JSON.parse(raw);
-    }
-    catch {
-        throw new ClawError("PROJECT_CONFIG_INVALID", "Cindy knowledge claim report input is invalid JSON.");
-    }
-    const sessionId = typeof parsed.session_id === "string" ? parsed.session_id.trim() : "";
-    const turnId = typeof parsed.turn_id === "string" ? parsed.turn_id.trim() : "";
-    const taskConclusions = Array.isArray(parsed.task_conclusions)
-        ? parsed.task_conclusions.flatMap((entry) => {
-            if (!entry || typeof entry !== "object" || Array.isArray(entry))
-                return [];
-            const item = entry;
-            const itemTurnId = typeof item.turnId === "string" ? item.turnId.trim() : "";
-            const message = typeof item.message === "string" ? item.message.trim() : "";
-            return itemTurnId && message ? [{ turnId: itemTurnId, message }] : [];
-        })
-        : [];
-    if (!sessionId || !turnId) {
-        throw new ClawError("PROJECT_CONFIG_INVALID", "Cindy knowledge claim report input requires session_id and turn_id.");
+/** Adapter-only registration. The descriptor contains no host history schema. */
+function runInternalReportCollectorRegister(args) {
+    const projectRoot = path.resolve(readRequiredFlag(args, "--project-root"));
+    const host = readRequiredFlag(args, "--collector-host");
+    const executable = readRequiredFlag(args, "--executable");
+    const collectorArgs = readRepeatedFlag(args, "--arg");
+    assertNoRemainingArgs(args, "internal-report-collector-register");
+    if (host !== "codex" && host !== "dsh" && host !== "cindy") {
+        throw new ClawError("PROJECT_CONFIG_INVALID", "report collector host must be codex, dsh, or cindy.");
     }
-    return { sessionId, turnId, taskConclusions };
+    registerReportCollector(projectRoot, { host, executable, args: collectorArgs });
+    printJson({ ok: true, command: "internal-report-collector-register", host });
 }
 async function runKnowledge(args) {
     const subcommand = args.shift();
@@ -1125,8 +1111,6 @@ async function runKnowledge(args) {
             const explicitJobPath = readOptionalFlag(args, "--job");
             const projectRoot = readOptionalFlag(args, "--project-root");
             const finalizeId = readOptionalFlag(args, "--finalize-id");
-            const captureCindyReport = readBooleanFlag(args, "--cindy-report-stdin");
-            const cindyCapture = captureCindyReport ? readCindyKnowledgeClaimCaptureInput() : undefined;
             if (explicitJobPath && (projectRoot || finalizeId)) {
                 throw new ClawError("PROJECT_CONFIG_INVALID", "knowledge claim accepts either --job or --project-root with --finalize-id.");
             }
@@ -1139,9 +1123,6 @@ async function runKnowledge(args) {
                 throw new Error(`Knowledge finalization ${finalizeId} is unavailable.`);
             }
             const queued = readKnowledgeFinalizationJob(jobPath);
-            if (queued.host === "codex" && queued.writer?.executionPolicy === "subagent" && queued.reportCapture?.mode === "claim" && queued.reportCapture.status !== "captured") {
-                await new Promise((resolve) => setTimeout(resolve, 10_000));
-            }
             const job = claimKnowledgeFinalizationJob(jobPath, {
                 prepare: (queued) => {
                     if (queued.writer?.executionPolicy !== "subagent"
@@ -1149,103 +1130,22 @@ async function runKnowledge(args) {
                         || queued.reportCapture.status === "captured") {
                         return;
                     }
-                    if (queued.host === "cindy") {
-                        if (!cindyCapture) {
-                            throw new Error(`Cindy report capture is unavailable for knowledge session ${queued.sessionId}.`);
-                        }
-                        if (cindyCapture.sessionId !== queued.sessionId) {
-                            throw new Error("Cindy report capture does not match the originating knowledge session.");
-                        }
-                        const capturedAt = new Date().toISOString();
-                        appendKnowledgeTaskConclusions(queued.reportPath, queued.sessionId, cindyCapture.taskConclusions, capturedAt);
-                        return {
-                            reportCapture: {
-                                ...queued.reportCapture,
-                                status: "captured",
-                                capturedAt,
-                                messageCount: cindyCapture.taskConclusions.length,
-                            },
-                        };
-                    }
-                    if (queued.host === "dsh") {
-                        // The dsh-adapter plugin reads the DSH session log at the terminal
-                        // plan mutation and writes the extracted final message + task.done
-                        // conclusions to a capture file (mirroring the Codex transcript
-                        // hand-off). Only conclusions from THIS plan's window are used:
-                        // the job's reportCapture.startedAt (registry activeStartedAt) is
-                        // the authoritative window start, and each conclusion carries its
-                        // event time.
-                        const capture = readDshKnowledgeCapture(queued.sessionId);
-                        if (!capture || capture.sessionId !== queued.sessionId) {
-                            throw new Error(`DSH report capture is unavailable for knowledge session ${queued.sessionId}.`);
-                        }
-                        const startedAtMs = queued.reportCapture?.startedAt
-                            ? Date.parse(queued.reportCapture.startedAt)
-                            : Number.NaN;
-                        const conclusions = (capture.taskConclusions ?? []).filter((conclusion) => {
-                            const time = conclusion.time;
-                            if (Number.isFinite(startedAtMs) && typeof time === "number") {
-                                return time >= startedAtMs;
-                            }
-                            return true;
-                        });
-                        const capturedAt = new Date().toISOString();
-                        appendKnowledgeTaskConclusions(queued.reportPath, queued.sessionId, conclusions, capturedAt);
-                        return {
-                            reportCapture: {
-                                ...queued.reportCapture,
-                                status: "captured",
-                                capturedAt,
-                                messageCount: conclusions.length,
-                            },
-                        };
-                    }
-                    if (queued.host == null) {
-                        // A job created by a pre-dsh-host build has host null. The
-                        // dsh-adapter plugin is the only writer of the dsh-capture file,
-                        // so its presence proves this is a DSH-originated session; route it
-                        // through the dsh branch instead of failing as "host unknown".
-                        const capture = readDshKnowledgeCapture(queued.sessionId);
-                        if (capture && capture.sessionId === queued.sessionId) {
-                            const startedAtMs = queued.reportCapture?.startedAt
-                                ? Date.parse(queued.reportCapture.startedAt)
-                                : Number.NaN;
-                            const conclusions = (capture.taskConclusions ?? []).filter((conclusion) => {
-                                const time = conclusion.time;
-                                if (Number.isFinite(startedAtMs) && typeof time === "number") {
-                                    return time >= startedAtMs;
-                                }
-                                return true;
-                            });
-                            const capturedAt = new Date().toISOString();
-                            appendKnowledgeTaskConclusions(queued.reportPath, queued.sessionId, conclusions, capturedAt);
-                            return {
-                                reportCapture: {
-                                    ...queued.reportCapture,
-                                    status: "captured",
-                                    capturedAt,
-                                    messageCount: conclusions.length,
-                                },
-                            };
-                        }
-                    }
-                    if (queued.host !== "codex") {
+                    if (queued.host !== "codex" && queued.host !== "dsh" && queued.host !== "cindy") {
                         throw new Error(`Claim-time report capture is unavailable for host ${queued.host ?? "unknown"}.`);
                     }
-                    const transcriptPath = findCodexTranscriptPath(queued.sessionId);
-                    if (!transcriptPath) {
-                        throw new Error(`Codex transcript is unavailable for knowledge session ${queued.sessionId}.`);
-                    }
-                    const conclusions = extractTaskDoneConclusions(transcriptPath, undefined, queued.reportCapture.startedAt, queued.planPath);
-                    const capturedAt = new Date().toISOString();
-                    appendKnowledgeTaskConclusions(queued.reportPath, queued.sessionId, conclusions, capturedAt);
+                    collectReport({
+                        host: queued.host,
+                        sessionId: queued.sessionId,
+                        projectRoot: queued.projectRoot,
+                        planPath: queued.planPath,
+                        canonicalReportPath: queued.reportPath,
+                        startedAt: queued.reportCapture.startedAt,
+                    });
                     return {
                         reportCapture: {
                             ...queued.reportCapture,
                             status: "captured",
-                            capturedAt,
-                            transcriptPath,
-                            messageCount: conclusions.length,
+                            capturedAt: new Date().toISOString(),
                         },
                     };
                 },
@@ -2237,16 +2137,14 @@ async function runStopHook(effectiveHost) {
     const hookCwd = resolveHookCwd(payload);
     const sessionId = resolveOwnerSessionKey(payload);
     const turnId = readHookString(payload, "turn_id");
-    const transcriptPath = readHookString(payload, "transcript_path");
     const payloadMessage = readHookString(payload, "message");
     if (!hookCwd || !sessionId || !turnId || !containsClawDir(hookCwd)) {
         return;
     }
     try {
         const project = resolveProjectContext(hookCwd);
-        // Codex passes a transcript_path; opencode and other hosts without a file
-        // transcript pass the final assistant message inline. Either source is valid.
-        const message = payloadMessage ?? (transcriptPath ? extractLatestFinalAssistantMessage(transcriptPath, turnId) : null);
+        // Host adapters own history parsing and pass their current final inline.
+        const message = payloadMessage;
         if (!message) {
             return;
         }
@@ -2256,7 +2154,7 @@ async function runStopHook(effectiveHost) {
             turnId,
             message,
             host: effectiveHost,
-            taskConclusions: transcriptPath ? extractTaskDoneConclusions(transcriptPath, turnId) : [],
+            taskConclusions: [],
         });
         // Current named hosts own their runner in their adapters.  Keep the CLI
         // launcher only for jobs written by pre-adapter releases with no host.
@@ -3177,7 +3075,11 @@ function compactPlanCommandResult(command, result, effectiveHost, completionRefr
     const hostActions = hostActionsResult ? buildCodexHostActions(result, { forceProjectionSync, actionIdPrefix: command === "plan.sync" ? `plan.sync:${createHash("sha256").update(result.planPath).digest("hex").slice(0, 16)}` : undefined }) : [];
     const nextsteps = [
         ...result.workflowGuidance.nextsteps,
-        ...(knowledgeDispatch
+        // Manual-dispatch instruction for hosts WITHOUT automatic writer
+        // dispatch (codex/cindy/opencode). DSH's adapter auto-dispatches the
+        // writer subagent inside claw_run, so the model must NOT re-dispatch;
+        // injecting this line there would ask it to duplicate the dispatch.
+        ...(knowledgeDispatch && effectiveHost !== "dsh"
             ? ["A knowledgeDispatch is present: dispatch its unchanged prompt through the current Host's designated knowledge-finalizer now, then immediately end the Lead turn; do not wait for or poll that worker."]
             : []),
     ];