@agentbridge1/cli 0.0.5 → 0.0.6

package/dist/commands/start.js

@@ -39,9 +39,8 @@ const domain_resolution_1 = require("../domain-resolution");
 const errors_1 = require("../errors");
 const error_catalog_1 = require("../error-catalog");
 const http_1 = require("../http");
-const git_status_1 = require("../git-status");
 const session_1 = require("../session");
-const work_contract_1 = require("../work-contract");
+const session_state_1 = require("../session-state");
 const server_sync_1 = require("../server-sync");
 const work_context_resolver_1 = require("../work-context-resolver");
 const PROMOTION_PLAN = {
@@ -567,84 +566,55 @@ async function executeStartWorkSession(opts) {
         otherSessionIds: [...new Set(otherSessionIds)],
     };
 }
-async function runSmartStart(opts = {}) {
-    const cfg = (0, config_1.readConfig)();
-    await ensureProjectAccess();
-    const ctx = (0, config_1.contextFromConfig)();
-    const explicitAgentId = opts.agentId?.trim();
-    const configuredActiveAgentId = cfg.activeAgentId?.trim();
-    if (!explicitAgentId && !configuredActiveAgentId) {
-        throw (0, errors_1.catalogCliError)("START_MISSING_ACTIVE_AGENT");
-    }
-    const executionSurfaceId = await resolveExecutionSurfaceIdForStart(ctx, opts, cfg.executionSurfaceId);
-    if (!executionSurfaceId) {
-        throw (0, errors_1.catalogCliError)("START_EXECUTION_SURFACE_REQUIRED");
-    }
-    const resolution = await (0, work_context_resolver_1.resolveWorkContext)(ctx, {
-        allowServerCurrentForCr: true,
-        includeOtherActiveSessions: true,
-    });
-    if (resolution.state === "current_session_resolved") {
-        process.stdout.write("Active work session found - entering watch mode.\n");
-        if (!opts.skipWatch) {
-            const { runWatch } = await Promise.resolve().then(() => __importStar(require("./watch")));
-            await runWatch({ allowDirty: true });
-        }
-        return;
-    }
-    if (resolution.state === "ambiguous_active_sessions") {
-        process.stdout.write(`${(0, work_context_resolver_1.renderWorkContextLines)(resolution).join("\n")}\n`);
-        throw (0, errors_1.catalogCliError)((0, error_catalog_1.workContextStateToCode)(resolution.state));
-    }
-    if (resolution.state === "mismatch" || resolution.state === "stale_orphan_session_detected") {
-        process.stdout.write(`${(0, work_context_resolver_1.renderWorkContextLines)(resolution).join("\n")}\n`);
-        throw (0, errors_1.catalogCliError)((0, error_catalog_1.workContextStateToCode)(resolution.state));
-    }
-    const inferred = (0, work_contract_1.inferWorkContract)({
+function hasActiveLocalRun() {
+    const local = (0, session_state_1.readSessionState)();
+    if (!local)
+        return false;
+    if (local.status !== "active" && local.status !== "blocked")
+        return false;
+    if (!local.id || local.id === "none")
+        return false;
+    return true;
+}
+async function runDefaultStart(opts = {}) {
+    const { runLocalSupervision } = await Promise.resolve().then(() => __importStar(require("../local-supervision")));
+    await runLocalSupervision({
         prompt: opts.prompt,
-        branchName: (0, git_status_1.getBranchName)(),
-        dirtyFiles: (0, git_status_1.getDirtyWorkingTreeFiles)(),
-        activeChangeRequestId: cfg.activeChangeRequestId ?? null,
-    });
-    const draft = {
-        summary: inferred.summary,
-        scope: opts.scope?.trim() || inferred.scope,
-    };
-    const confirmed = await (0, work_contract_1.confirmWorkContract)(draft, {
-        nonInteractive: !process.stdin.isTTY,
-    });
-    if (!confirmed) {
-        process.stdout.write("Cancelled.\n");
-        return;
-    }
-    await executeStartWorkSession({
-        ...opts,
-        summary: confirmed.summary,
-        scope: confirmed.scope,
+        details: opts.details,
+        confirmClose: opts.confirmClose,
     });
-    process.stdout.write("Work session started. Entering watch mode...\n");
-    if (!opts.skipWatch) {
-        const { runWatch } = await Promise.resolve().then(() => __importStar(require("./watch")));
-        await runWatch({ allowDirty: true });
-    }
+}
+function isStrictTrackedStartRequest(opts) {
+    if (opts.resume === true)
+        return true;
+    if (opts.changeRequestId?.trim())
+        return true;
+    const explicitSummaryFlag = opts.summaryFlagProvided === true;
+    const explicitScopeFlag = opts.scopeFlagProvided === true;
+    const explicitInputProvided = opts.summary !== undefined || opts.scope !== undefined;
+    return explicitSummaryFlag || explicitScopeFlag || explicitInputProvided;
 }
 async function runStart(opts = {}) {
+    const strictTrackedStart = isStrictTrackedStartRequest(opts);
     const explicitSummaryFlag = opts.summaryFlagProvided === true;
     const explicitScopeFlag = opts.scopeFlagProvided === true;
     const explicitInputProvided = opts.summary !== undefined || opts.scope !== undefined;
     const explicitModeRequested = explicitSummaryFlag || explicitScopeFlag || explicitInputProvided;
     const explicitSummary = opts.summary?.trim();
     const explicitScope = opts.scope?.trim();
-    if (explicitModeRequested && explicitSummary && explicitScope) {
+    if (strictTrackedStart && explicitSummary && explicitScope) {
         await executeStartWorkSession({ ...opts, summary: explicitSummary, scope: explicitScope });
         if (!opts.skipWatch) {
             const { runWatch } = await Promise.resolve().then(() => __importStar(require("./watch")));
-            await runWatch({ allowDirty: true });
+            await runWatch({ allowDirty: true, details: opts.details });
         }
         return;
     }
+    if (strictTrackedStart) {
+        throw (0, errors_1.catalogCliError)("START_EXPLICIT_PAIR_REQUIRED");
+    }
     if (explicitModeRequested) {
         throw (0, errors_1.catalogCliError)("START_EXPLICIT_PAIR_REQUIRED");
     }
-    await runSmartStart(opts);
+    await runDefaultStart(opts);
 }

package/dist/commands/verify.js

@@ -4,22 +4,22 @@ exports.runVerify = runVerify;
 const node_child_process_1 = require("node:child_process");
 const config_1 = require("../config");
 const errors_1 = require("../errors");
-const error_catalog_1 = require("../error-catalog");
-const session_state_1 = require("../session-state");
-const server_sync_1 = require("../server-sync");
 const file_fingerprints_1 = require("../file-fingerprints");
 const git_status_1 = require("../git-status");
 const operator_snapshot_1 = require("../operator-snapshot");
+const session_1 = require("../session");
+const session_state_1 = require("../session-state");
+const server_sync_1 = require("../server-sync");
 const work_context_resolver_1 = require("../work-context-resolver");
 const verification_conditions_1 = require("../verification-conditions");
 const MAX_EXCERPT_CHARS = 8000;
-function resolveNetworkContext() {
+function tryResolveNetworkContext() {
     const cfg = (0, config_1.readConfig)();
     const projectId = process.env.AGENTBRIDGE_PROJECT_ID ?? cfg.projectId;
     const apiKey = process.env.AGENTBRIDGE_API_KEY ?? cfg.apiKey ?? "";
     const apiBaseUrl = process.env.AGENTBRIDGE_BASE_URL ?? cfg.apiBaseUrl ?? "https://agentauth-api-production.up.railway.app";
     if (!projectId || !apiKey) {
-        throw (0, errors_1.catalogCliError)("CONFIG_INCOMPLETE");
+        return null;
     }
     return { projectId, apiKey, apiBaseUrl };
 }
@@ -45,6 +45,29 @@ function normalizeChangedFiles(files) {
 function repoDirtySnapshot() {
     return (0, git_status_1.repoDirtySnapshotFromGitStatus)();
 }
+function ensureWritableSessionState() {
+    const cfg = (0, config_1.readConfig)();
+    const existing = (0, session_state_1.readSessionState)();
+    if (existing && existing.status !== "closed" && existing.id !== "none") {
+        return existing;
+    }
+    return (0, session_1.openLocalSession)({
+        agentId: cfg.activeAgentId ?? "CLI Agent",
+        laneDomain: null,
+        claimedPaths: [],
+        domains: cfg.domains ?? [],
+    });
+}
+function persistLocalVerificationRun(run) {
+    const state = ensureWritableSessionState();
+    state.lastLocalVerificationRun = run;
+    const scopeFiles = normalizeChangedFiles(run.proofScopeFiles);
+    if (scopeFiles.length > 0) {
+        state.changedFiles = [...new Set([...(state.changedFiles ?? []), ...scopeFiles])].sort();
+    }
+    (0, session_state_1.writeSessionState)(state);
+    return state;
+}
 async function preflightSyncLocalChangedFiles(ctx, workSessionId) {
     const state = (0, session_state_1.readSessionState)();
     if (!state)
@@ -105,61 +128,38 @@ async function runVerify(commandInput, options = {}) {
     if (!command) {
         throw (0, errors_1.catalogCliError)("VERIFY_COMMAND_REQUIRED");
     }
-    const ctx = resolveNetworkContext();
-    const resolution = await (0, work_context_resolver_1.resolveWorkContext)(ctx, {
-        useConfigActiveChangeRequestId: false,
-        includeOtherActiveSessions: true,
-    });
-    if (resolution.state !== "current_session_resolved" || !resolution.binding) {
-        const workContextErr = (0, errors_1.catalogCliError)((0, error_catalog_1.workContextStateToCode)(resolution.state));
-        if (options.json) {
-            const snapshot = (0, operator_snapshot_1.buildOperatorSnapshot)(resolution);
-            process.stdout.write(`${JSON.stringify({
-                snapshot,
-                verification_recorded: false,
-                next_action: [
-                    'run agentbridge start --summary "<work>" --scope "<path>"',
-                    "run agentbridge watch --allow-dirty",
-                ],
-            }, null, 2)}\n`);
-            process.stderr.write(`${(0, errors_1.renderCliError)(workContextErr)}\n`);
-            process.exitCode = 1;
-            return;
-        }
-        process.stdout.write(`${[
-            ...(0, work_context_resolver_1.renderWorkContextLines)(resolution),
-            "",
-            "Verification was not recorded.",
-            "",
-            "Next action:",
-            '- run agentbridge start --summary "<work>" --scope "<path>"',
-            "- or run agentbridge watch --allow-dirty",
-        ].join("\n")}\n`);
-        process.stderr.write(`${(0, errors_1.renderCliError)(workContextErr)}\n`);
-        process.exitCode = 1;
-        return;
-    }
-    const { workSessionId } = (0, work_context_resolver_1.requireWorkContextBinding)(resolution, "verify");
+    const ctx = tryResolveNetworkContext();
     const startedAt = new Date().toISOString();
     const run = await execute(command);
     const finishedAt = new Date().toISOString();
     const status = run.exitCode === 0 ? "passed" : "failed";
-    let localSessionChangedFiles = [];
-    try {
-        localSessionChangedFiles = await preflightSyncLocalChangedFiles(ctx, workSessionId);
-    }
-    catch {
-        localSessionChangedFiles = [];
-    }
+    let localSessionChangedFiles = normalizeChangedFiles((0, session_state_1.readSessionState)()?.changedFiles ?? []);
+    const dirtySnapshot = repoDirtySnapshot();
     let acceptanceChangedFiles = [];
-    try {
-        const report = await (0, server_sync_1.fetchAcceptanceCheck)(ctx, { workSessionId });
-        acceptanceChangedFiles = normalizeChangedFiles(report.changed_files ?? []);
-    }
-    catch {
-        acceptanceChangedFiles = [];
+    let workSessionId = null;
+    let resolution = null;
+    if (ctx) {
+        resolution = await (0, work_context_resolver_1.resolveWorkContext)(ctx, {
+            useConfigActiveChangeRequestId: false,
+            includeOtherActiveSessions: true,
+        });
+        if (resolution.state === "current_session_resolved" && resolution.binding) {
+            workSessionId = (0, work_context_resolver_1.requireWorkContextBinding)(resolution, "verify").workSessionId;
+            try {
+                localSessionChangedFiles = await preflightSyncLocalChangedFiles(ctx, workSessionId);
+            }
+            catch {
+                localSessionChangedFiles = normalizeChangedFiles((0, session_state_1.readSessionState)()?.changedFiles ?? []);
+            }
+            try {
+                const report = await (0, server_sync_1.fetchAcceptanceCheck)(ctx, { workSessionId });
+                acceptanceChangedFiles = normalizeChangedFiles(report.changed_files ?? []);
+            }
+            catch {
+                acceptanceChangedFiles = [];
+            }
+        }
     }
-    const dirtySnapshot = repoDirtySnapshot();
     const proofScopeFiles = acceptanceChangedFiles.length > 0
         ? acceptanceChangedFiles
         : localSessionChangedFiles.length > 0
@@ -175,10 +175,10 @@ async function runVerify(commandInput, options = {}) {
         command,
         proofScopeFiles,
         proofScopeSource,
-        serverBacked: true,
+        serverBacked: workSessionId !== null,
     });
     const confidence = (0, verification_conditions_1.buildVerificationConfidence)({ status, conditions });
-    await (0, server_sync_1.postVerificationRun)(ctx, { workSessionId }, {
+    const localRun = {
         command,
         startedAt,
         finishedAt,
@@ -186,40 +186,61 @@ async function runVerify(commandInput, options = {}) {
         stdoutExcerpt: excerpt(run.stdout),
         stderrExcerpt: excerpt(run.stderr),
         gitHead: currentGitHead(),
-        changedFilesSnapshot: proofScopeFiles,
-        proofScopeFiles,
-        proofScopeSource,
         repoDirtySnapshot: dirtySnapshot,
+        proofScopeFiles,
         proofScopeFingerprints,
         status,
-        conditions,
-        confidence,
-    });
+    };
+    persistLocalVerificationRun(localRun);
+    if (ctx && workSessionId) {
+        await (0, server_sync_1.postVerificationRun)(ctx, { workSessionId }, {
+            command,
+            startedAt,
+            finishedAt,
+            exitCode: run.exitCode,
+            stdoutExcerpt: excerpt(run.stdout),
+            stderrExcerpt: excerpt(run.stderr),
+            gitHead: currentGitHead(),
+            changedFilesSnapshot: proofScopeFiles,
+            proofScopeFiles,
+            proofScopeSource,
+            repoDirtySnapshot: dirtySnapshot,
+            proofScopeFingerprints,
+            status,
+            conditions,
+            confidence,
+        });
+    }
     let protocolWarnings = [];
     let latestReport = null;
-    try {
-        const report = await (0, server_sync_1.fetchAcceptanceCheck)(ctx, { workSessionId });
-        latestReport = report;
-        protocolWarnings = report.protocol_warnings ?? [];
-        const warnings = renderProtocolWarnings(protocolWarnings);
-        if (warnings.length > 0) {
-            process.stdout.write(`${warnings.join("\n")}\n`);
+    if (ctx && workSessionId) {
+        try {
+            const report = await (0, server_sync_1.fetchAcceptanceCheck)(ctx, { workSessionId });
+            latestReport = report;
+            protocolWarnings = report.protocol_warnings ?? [];
+            const warnings = renderProtocolWarnings(protocolWarnings);
+            if (warnings.length > 0) {
+                process.stdout.write(`${warnings.join("\n")}\n`);
+            }
+        }
+        catch {
+            // Verification recording is authoritative; warning fetch is best-effort.
         }
-    }
-    catch {
-        // Verification recording is authoritative; warning fetch is best-effort.
     }
     if (options.json) {
-        const report = latestReport ?? (await (0, server_sync_1.fetchAcceptanceCheck)(ctx, { workSessionId }));
-        const snapshot = (0, operator_snapshot_1.buildOperatorSnapshot)({
-            ...resolution,
-            binding: {
-                workSessionId,
-                changeRequestId: report.change_request_id ?? null,
-                report,
-            },
-            resolvedServerSessionId: report.work_session_id,
-            resolvedChangeRequestId: report.change_request_id ?? null,
+        const report = latestReport ??
+            (ctx && workSessionId ? await (0, server_sync_1.fetchAcceptanceCheck)(ctx, { workSessionId }) : null);
+        const snapshot = (0, operator_snapshot_1.buildOperatorSnapshot)(resolution ?? {
+            state: "no_current_session",
+            contextSource: "none",
+            requestedChangeRequestId: null,
+            binding: null,
+            ambiguousSessions: [],
+            otherActiveSessions: [],
+            localServerSessionId: null,
+            resolvedServerSessionId: null,
+            resolvedChangeRequestId: null,
+            message: "No active tracked work session. Run agentbridge watch for live supervision.",
         });
         process.stdout.write(`${JSON.stringify({
             snapshot,
@@ -233,30 +254,42 @@ async function runVerify(commandInput, options = {}) {
                 confidence,
                 conditions,
                 protocol_warnings: protocolWarnings,
+                recorded_locally: true,
             },
         }, null, 2)}\n`);
+        if (status !== "passed") {
+            process.exitCode = 1;
+        }
         return;
     }
     if (status === "passed") {
         const confidenceLines = (0, verification_conditions_1.renderConfidenceSummary)(confidence);
         const hygieneWarning = (0, verification_conditions_1.renderMockHygieneWarning)(conditions.mock_hygiene);
-        process.stdout.write([
+        const lines = [
             "Verification passed.",
             `Command: ${command}`,
-            `Attached to run: ${workSessionId}`,
-            ...confidenceLines,
-            ...(hygieneWarning ? [hygieneWarning] : []),
-            "Run agentbridge check to review the watch result.",
-        ].join("\n") + "\n");
+            "Proof recorded locally.",
+        ];
+        if (workSessionId) {
+            lines.push(`Attached to run: ${workSessionId}`);
+        }
+        lines.push(...confidenceLines);
+        if (hygieneWarning)
+            lines.push(hygieneWarning);
+        lines.push("Keep agentbridge watch running beside Cursor to supervise changes.");
+        process.stdout.write(`${lines.join("\n")}\n`);
         return;
     }
     process.stdout.write([
         "Verification failed.",
         `Command: ${command}`,
         `Exit code: ${run.exitCode}`,
-        `Attached to run: ${workSessionId}`,
-        "Run agentbridge check to review failed proof.",
-    ].join("\n") + "\n");
+        "Proof recorded locally (failed).",
+        workSessionId ? `Attached to run: ${workSessionId}` : "",
+        "Fix the failure and rerun: agentbridge verify -- <test command>",
+    ]
+        .filter((line) => line.length > 0)
+        .join("\n") + "\n");
     process.stderr.write(`${(0, errors_1.renderCliError)((0, errors_1.catalogCliError)("VERIFY_COMMAND_FAILED", {
         what: `Verification command "${command}" failed with exit code ${run.exitCode}.`,
     }))}\n`);