@agentbridge1/cli 0.0.5 → 0.0.6

package/dist/session-state.js

@@ -1,5 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isActiveLocalSession = isActiveLocalSession;
+exports.resolveRepoRoot = resolveRepoRoot;
 exports.readSessionState = readSessionState;
 exports.writeSessionState = writeSessionState;
 exports.archiveClosedSession = archiveClosedSession;
@@ -8,11 +10,34 @@ exports.readRecentHandoffs = readRecentHandoffs;
 exports.clearSessionState = clearSessionState;
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
-const SESSION_PATH = (0, node_path_1.resolve)(process.cwd(), ".agentbridge", "session.json");
-const SESSIONS_DIR = (0, node_path_1.resolve)(process.cwd(), ".agentbridge", "sessions");
-const HANDOFFS_DIR = (0, node_path_1.resolve)(process.cwd(), ".agentbridge", "handoffs");
-const SESSION_DIR = (0, node_path_1.resolve)(process.cwd(), ".agentbridge");
-const SESSION_BACKUP_PATH = (0, node_path_1.resolve)(SESSION_DIR, "session.json.bak");
+const local_proof_1 = require("./local-proof");
+function isActiveLocalSession(state) {
+    if (!state)
+        return false;
+    if (state.status === "closed")
+        return false;
+    if (!state.id || state.id === "none")
+        return false;
+    return true;
+}
+function resolveRepoRoot() {
+    return process.env.AGENTBRIDGE_REPO_ROOT?.trim() || process.cwd();
+}
+function sessionDir() {
+    return (0, node_path_1.resolve)(resolveRepoRoot(), ".agentbridge");
+}
+function sessionPath() {
+    return (0, node_path_1.resolve)(sessionDir(), "session.json");
+}
+function sessionsDir() {
+    return (0, node_path_1.resolve)(sessionDir(), "sessions");
+}
+function handoffsDir() {
+    return (0, node_path_1.resolve)(sessionDir(), "handoffs");
+}
+function sessionBackupPath() {
+    return (0, node_path_1.resolve)(sessionDir(), "session.json.bak");
+}
 function isRecord(value) {
     return typeof value === "object" && value !== null;
 }
@@ -28,6 +53,49 @@ function isBoundaryCrossingArray(value) {
 function isScopedApprovalArray(value) {
     return Array.isArray(value);
 }
+const AGENT_ACTIVITY_EVENTS = new Set([
+    "start_work_session",
+    "claim_lane",
+    "release_lane",
+    "update_work_session_scope",
+    "post_handoff",
+    "close_work_session",
+]);
+function isAgentActivity(value) {
+    if (!isRecord(value))
+        return false;
+    if (value.source !== "mcp")
+        return false;
+    if (typeof value.updatedAt !== "string" || value.updatedAt.length === 0)
+        return false;
+    if (!AGENT_ACTIVITY_EVENTS.has(value.lastEvent))
+        return false;
+    if (value.intent !== undefined && typeof value.intent !== "string")
+        return false;
+    if (value.claimedPaths !== undefined && !isStringArray(value.claimedPaths))
+        return false;
+    if (value.workSessionId !== undefined && typeof value.workSessionId !== "string")
+        return false;
+    if (value.changeRequestId !== undefined && typeof value.changeRequestId !== "string")
+        return false;
+    if (value.laneDomain !== undefined && value.laneDomain !== null && typeof value.laneDomain !== "string") {
+        return false;
+    }
+    if (value.laneId !== undefined && typeof value.laneId !== "string")
+        return false;
+    if (value.laneType !== undefined && !["product_area", "file_path", "task", "system"].includes(String(value.laneType))) {
+        return false;
+    }
+    if (value.laneValue !== undefined && typeof value.laneValue !== "string")
+        return false;
+    if (value.summary !== undefined && typeof value.summary !== "string")
+        return false;
+    if (value.closedAt !== undefined && typeof value.closedAt !== "string")
+        return false;
+    if (value.handoffId !== undefined && typeof value.handoffId !== "string")
+        return false;
+    return true;
+}
 function isLocalSessionState(value) {
     if (!isRecord(value))
         return false;
@@ -49,30 +117,57 @@ function isLocalSessionState(value) {
         return false;
     if (typeof value.createdAt !== "string" || value.createdAt.length === 0)
         return false;
+    if (value.intent !== undefined && typeof value.intent !== "string")
+        return false;
+    if (value.mode !== undefined &&
+        value.mode !== "local_supervision" &&
+        value.mode !== "strict_tracked") {
+        return false;
+    }
+    if (value.updatedAt !== undefined && typeof value.updatedAt !== "string")
+        return false;
+    if (value.closedAt !== undefined && typeof value.closedAt !== "string")
+        return false;
     if (value.claimedPaths !== undefined && !isStringArray(value.claimedPaths))
         return false;
+    if (value.lastLocalVerificationRun !== undefined &&
+        !(0, local_proof_1.isLocalVerificationRun)(value.lastLocalVerificationRun)) {
+        return false;
+    }
+    if (value.agentActivity !== undefined && !isAgentActivity(value.agentActivity)) {
+        return false;
+    }
     return true;
 }
+function sanitizeAgentActivity(state) {
+    if (state.agentActivity !== undefined && !isAgentActivity(state.agentActivity)) {
+        const { agentActivity: _removed, ...rest } = state;
+        return rest;
+    }
+    return state;
+}
 function readJsonFile(path) {
     return JSON.parse((0, node_fs_1.readFileSync)(path, "utf8"));
 }
 function quarantineInvalidSessionFile() {
-    if (!(0, node_fs_1.existsSync)(SESSION_PATH))
+    const path = sessionPath();
+    if (!(0, node_fs_1.existsSync)(path))
         return;
-    const quarantinedPath = (0, node_path_1.resolve)(SESSION_DIR, `session.invalid-${new Date().toISOString().replace(/[:.]/g, "-")}.json`);
-    (0, node_fs_1.renameSync)(SESSION_PATH, quarantinedPath);
+    const quarantinedPath = (0, node_path_1.resolve)(sessionDir(), `session.invalid-${new Date().toISOString().replace(/[:.]/g, "-")}.json`);
+    (0, node_fs_1.renameSync)(path, quarantinedPath);
 }
 function readSessionState() {
-    if (!(0, node_fs_1.existsSync)(SESSION_PATH)) {
+    const path = sessionPath();
+    if (!(0, node_fs_1.existsSync)(path)) {
         return null;
     }
     try {
-        const parsed = readJsonFile(SESSION_PATH);
+        const parsed = readJsonFile(path);
         if (!isLocalSessionState(parsed)) {
             quarantineInvalidSessionFile();
             return null;
         }
-        return parsed;
+        return sanitizeAgentActivity(parsed);
     }
     catch {
         quarantineInvalidSessionFile();
@@ -83,8 +178,10 @@ function writeSessionState(state) {
     if (!isLocalSessionState(state)) {
         throw new Error("Refusing to write invalid session state.");
     }
-    (0, node_fs_1.mkdirSync)(SESSION_DIR, { recursive: true });
-    const tempPath = (0, node_path_1.resolve)(SESSION_DIR, `session.json.tmp-${process.pid.toString()}-${Date.now().toString(36)}`);
+    const dir = sessionDir();
+    const path = sessionPath();
+    (0, node_fs_1.mkdirSync)(dir, { recursive: true });
+    const tempPath = (0, node_path_1.resolve)(dir, `session.json.tmp-${process.pid.toString()}-${Date.now().toString(36)}`);
     const serialized = `${JSON.stringify(state, null, 2)}\n`;
     (0, node_fs_1.writeFileSync)(tempPath, serialized, "utf8");
     const tempParsed = readJsonFile(tempPath);
@@ -92,10 +189,10 @@ function writeSessionState(state) {
         (0, node_fs_1.rmSync)(tempPath, { force: true });
         throw new Error("Refusing to persist invalid session state payload.");
     }
-    if ((0, node_fs_1.existsSync)(SESSION_PATH)) {
-        (0, node_fs_1.renameSync)(SESSION_PATH, SESSION_BACKUP_PATH);
+    if ((0, node_fs_1.existsSync)(path)) {
+        (0, node_fs_1.renameSync)(path, sessionBackupPath());
     }
-    (0, node_fs_1.renameSync)(tempPath, SESSION_PATH);
+    (0, node_fs_1.renameSync)(tempPath, path);
 }
 function timestampPrefix(iso) {
     return iso.replace(/[:.]/g, "-");
@@ -107,20 +204,21 @@ function writeArchive(dir, state) {
     (0, node_fs_1.writeFileSync)((0, node_path_1.resolve)(dir, fileName), `${JSON.stringify(state, null, 2)}\n`, "utf8");
 }
 function archiveClosedSession(state) {
-    writeArchive(SESSIONS_DIR, state);
+    writeArchive(sessionsDir(), state);
 }
 function archiveHandoff(state) {
-    writeArchive(HANDOFFS_DIR, state);
+    writeArchive(handoffsDir(), state);
 }
 function readRecentHandoffs(limit = 1) {
-    if (!(0, node_fs_1.existsSync)(HANDOFFS_DIR)) {
+    const dir = handoffsDir();
+    if (!(0, node_fs_1.existsSync)(dir)) {
         return [];
     }
-    const files = (0, node_fs_1.readdirSync)(HANDOFFS_DIR)
+    const files = (0, node_fs_1.readdirSync)(dir)
         .filter((file) => file.endsWith(".json"))
         .sort((a, b) => b.localeCompare(a))
         .slice(0, Math.max(0, limit));
-    return files.map((file) => JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.resolve)(HANDOFFS_DIR, file), "utf8")));
+    return files.map((file) => JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.resolve)(dir, file), "utf8")));
 }
 function clearSessionState() {
     writeSessionState({

package/dist/session.js

@@ -53,10 +53,13 @@ function captureLocalSessionBaseline() {
 function openLocalSession(input) {
     const claimedPaths = [...new Set((input.claimedPaths ?? []).map((path) => path.trim()).filter(Boolean))];
     const baseline = captureLocalSessionBaseline();
+    const now = baseline.startedAt;
     const state = {
         id: `local_${Date.now().toString(36)}`,
-        agentId: input.agentId,
+        agentId: input.agentId?.trim() || "local",
         laneDomain: input.laneDomain,
+        intent: input.intent?.trim() || undefined,
+        mode: input.mode,
         changeRequestId: input.changeRequestId,
         claimedPaths,
         status: "active",
@@ -67,7 +70,8 @@ function openLocalSession(input) {
         serverSessionId: input.serverSessionId,
         pendingHandoffToAgent: input.pendingHandoffToAgent,
         pendingHandoffDomain: input.pendingHandoffDomain,
-        createdAt: baseline.startedAt,
+        createdAt: now,
+        updatedAt: now,
         startedAt: baseline.startedAt,
         gitHead: baseline.gitHead,
         dirtyFilesAtStart: baseline.dirtyFilesAtStart,
@@ -81,8 +85,11 @@ function closeLocalSession(state) {
     if (!closable.ok) {
         return { ok: false, reason: closable.reason ?? "Session blocked" };
     }
+    const closedAt = new Date().toISOString();
     state.status = "closed";
     state.closeReason = state.closeReason ?? "completed";
+    state.closedAt = closedAt;
+    state.updatedAt = closedAt;
     (0, session_state_1.archiveClosedSession)(state);
     (0, session_state_1.writeSessionState)(state);
     return { ok: true };

package/dist/supervision.js

@@ -5,9 +5,12 @@ exports.requiredProofHints = requiredProofHints;
 exports.computeScopeDriftAlerts = computeScopeDriftAlerts;
 exports.supervisionFromAcceptance = supervisionFromAcceptance;
 exports.fallbackSupervisionSnapshot = fallbackSupervisionSnapshot;
+exports.enrichSupervisionWithLocalState = enrichSupervisionWithLocalState;
 exports.supervisionSignature = supervisionSignature;
 exports.renderSupervisionSummary = renderSupervisionSummary;
+const claimed_paths_1 = require("./claimed-paths");
 const domain_resolution_1 = require("./domain-resolution");
+const preflight_changed_files_1 = require("./preflight-changed-files");
 const memory_context_render_1 = require("./memory-context-render");
 const CLI_GIT_REQUIRED_PROOF = [
     "tracked modified file handled",
@@ -41,7 +44,7 @@ function requiredProofHints(workType) {
         return ["explicit verification evidence for changed docs/files"];
     return [
         "explicit verification evidence for changed files",
-        "run agentbridge check for full acceptance state",
+        "run agentbridge verify, then rerun agentbridge watch",
     ];
 }
 function escapeRegex(text) {
@@ -121,7 +124,7 @@ function supervisionFromAcceptance(report, domains) {
         requiredProof,
         knownTraps: report.known_traps.slice(0, 3),
         memoryContext: report.memory_context,
-        nextAction: "Run verification command(s), then run agentbridge check.",
+        nextAction: "Run `agentbridge verify -- <command>`, then rerun `agentbridge watch`.",
         driftAlerts,
     };
 }
@@ -144,11 +147,69 @@ function fallbackSupervisionSnapshot(input) {
         decision: input.unresolvedProtectedCrossing || input.blocked ? "failed" : "needs_proof",
         requiredProof,
         knownTraps: [],
-        nextAction: "Run verification command(s), then run agentbridge check.",
+        nextAction: "Run `agentbridge verify -- <command>`, then rerun `agentbridge watch`.",
         driftAlerts,
         serverAcceptanceUnavailable: input.serverAcceptanceUnavailable,
     };
 }
+function formatMcpEventTime(iso) {
+    if (!iso)
+        return "";
+    try {
+        const d = new Date(iso);
+        const h = d.getHours().toString().padStart(2, "0");
+        const m = d.getMinutes().toString().padStart(2, "0");
+        return `${h}:${m}`;
+    }
+    catch {
+        return "";
+    }
+}
+function effectiveDeclaredPaths(state) {
+    return uniqueSorted([
+        ...(state.claimedPaths ?? []),
+        ...(state.agentActivity?.claimedPaths ?? []),
+    ]);
+}
+/** Merge local session MCP mirror + post-baseline disk lens into a supervision snapshot. */
+function enrichSupervisionWithLocalState(state, supervision) {
+    const postBaselineFiles = state.startedAt != null ? (0, preflight_changed_files_1.computeCurrentWorkFiles)(state) : [];
+    const totalDirty = (0, preflight_changed_files_1.repoDirtySnapshot)().length;
+    const claimedPaths = effectiveDeclaredPaths(state);
+    const driftFiles = claimedPaths.length > 0 ? (0, claimed_paths_1.filesOutsideClaimedPaths)(postBaselineFiles, claimedPaths) : [];
+    const declaredVsObservedDrift = claimedPaths.length > 0 && driftFiles.length > 0 ? "warn" : "none";
+    const activity = state.agentActivity;
+    const hasDeclared = activity !== undefined || Boolean(state.intent?.trim()) || claimedPaths.length > 0;
+    const agentDeclared = hasDeclared
+        ? {
+            intent: activity?.intent ?? state.intent,
+            claimedPaths,
+            lastEvent: activity?.lastEvent,
+            workSessionId: activity?.workSessionId ?? state.serverSessionId,
+            updatedAt: activity?.updatedAt,
+            summary: activity?.summary,
+            fromMcp: activity?.source === "mcp",
+        }
+        : undefined;
+    const changedFiles = postBaselineFiles.length > 0 ? postBaselineFiles : supervision.changedFiles;
+    return {
+        ...supervision,
+        changedFiles,
+        workType: inferSupervisionWorkType(changedFiles),
+        agentDeclared,
+        diskObserved: {
+            postBaselineFiles,
+            totalDirty,
+        },
+        declaredVsObservedDrift,
+        declaredDriftFiles: driftFiles,
+        scopeStatus: declaredVsObservedDrift === "warn"
+            ? "drift"
+            : supervision.scopeStatus === "unknown" && changedFiles.length > 0
+                ? "clean"
+                : supervision.scopeStatus,
+    };
+}
 function supervisionSignature(snapshot) {
     return JSON.stringify({
         workSessionId: snapshot.workSessionId,
@@ -160,12 +221,45 @@ function supervisionSignature(snapshot) {
         requiredProof: snapshot.requiredProof,
         drift: snapshot.driftAlerts.map((a) => `${a.file}:${a.severity}:${a.likelyDomain}`),
         serverAcceptanceUnavailable: snapshot.serverAcceptanceUnavailable ? "yes" : "no",
+        agentDeclared: snapshot.agentDeclared
+            ? `${snapshot.agentDeclared.intent ?? ""}:${snapshot.agentDeclared.lastEvent ?? ""}`
+            : "",
+        declaredDrift: snapshot.declaredDriftFiles?.join(",") ?? "",
     });
 }
-function renderSupervisionSummary(snapshot) {
+function renderSupervisionSummary(snapshot, options) {
     const lines = [];
-    lines.push("AgentBridge supervision:");
-    lines.push(`Current run: ${snapshot.workSessionId}${snapshot.changeRequestId ? ` / task ${snapshot.changeRequestId}` : ""}`);
+    lines.push(options?.compact ? "AgentBridge watch:" : "AgentBridge supervision:");
+    if (!options?.compact) {
+        lines.push(`Current run: ${snapshot.workSessionId}${snapshot.changeRequestId ? ` / task ${snapshot.changeRequestId}` : ""}`);
+    }
+    const declared = snapshot.agentDeclared;
+    if (declared) {
+        const intentLabel = declared.intent?.trim() || declared.summary?.trim() || "(no intent text)";
+        const eventSuffix = declared.lastEvent && declared.updatedAt
+            ? ` [${declared.lastEvent} @ ${formatMcpEventTime(declared.updatedAt)}]`
+            : declared.lastEvent
+                ? ` [${declared.lastEvent}]`
+                : "";
+        lines.push(`Agent (MCP): ${intentLabel}${eventSuffix}`);
+        if (declared.claimedPaths.length > 0) {
+            const scopePreview = declared.claimedPaths.length > 6
+                ? `${declared.claimedPaths.slice(0, 6).join(", ")} (+${declared.claimedPaths.length - 6} more)`
+                : declared.claimedPaths.join(", ");
+            lines.push(`Declared scope: ${scopePreview}`);
+        }
+        else {
+            lines.push("Declared scope: (none yet)");
+        }
+    }
+    const diskCount = snapshot.diskObserved?.postBaselineFiles.length ?? snapshot.changedFiles.length;
+    lines.push(`Files (disk): ${diskCount} changed since session start`);
+    if (snapshot.declaredVsObservedDrift === "warn" && snapshot.declaredDriftFiles?.length) {
+        const preview = snapshot.declaredDriftFiles.length > 4
+            ? `${snapshot.declaredDriftFiles.slice(0, 4).join(", ")} (+${snapshot.declaredDriftFiles.length - 4} more)`
+            : snapshot.declaredDriftFiles.join(", ");
+        lines.push(`Note: ${snapshot.declaredDriftFiles.length} file(s) outside declared scope (${preview}) — warn only, not blocked`);
+    }
     lines.push(`Changed files: ${snapshot.changedFiles.length}`);
     lines.push(`Detected work type: ${snapshot.workType}`);
     lines.push(`Scope: ${snapshot.scopeStatus}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentbridge1/cli",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "CLI for AgentBridge — structured AI agent work sessions with domain authority and approval gates",
   "type": "commonjs",
   "bin": {
@@ -10,7 +10,7 @@
     "build": "node build.mjs",
     "prepare": "npm run build",
     "prepack": "npm run build",
-    "smoke": "npm run build && node dist/index.js --help && node dist/index.js mcp --help",
+    "smoke": "npm run build && test -f dist/mcp/agentbridge-mcp.js && node dist/index.js --help && node dist/index.js mcp --help",
     "typecheck": "tsc -p tsconfig.json --noEmit",
     "test": "vitest run"
   },
@@ -41,5 +41,8 @@
   "dependencies": {
     "chalk": "^5.6.2",
     "chokidar": "^4.0.3"
+  },
+  "devDependencies": {
+    "esbuild": "^0.25.12"
   }
 }