opensquid 0.5.395

package/dist/hooks/user-prompt-submit.js

@@ -0,0 +1,256 @@
+/**
+ * `opensquid hook user-prompt-submit` — Claude Code UserPromptSubmit
+ * hook handler.
+ *
+ * Fires when the user submits a prompt (start of every new turn).
+ * Surfaces TWO accumulator surfaces via stdout so the agent sees them
+ * in its system context:
+ *
+ *   1. broken-promises.jsonl — claims from the prior assistant turn
+ *      that the honesty ledger flagged as unfulfilled.
+ *   2. heartbeat-pending.txt — token-threshold re-anchor nudge written
+ *      by the Stop hook when the transcript grew past the configured
+ *      threshold (default 20K tokens, OPENSQUID_HEARTBEAT_TOKENS).
+ *
+ * Both surfaces are CLEARED after surfacing — one chance per item per
+ * session, no infinite nagging.
+ *
+ * Exit 0 always — UserPromptSubmit is observational.
+ *
+ * Pre-#124: this hook also surfaced auto-classify-candidates.jsonl
+ * written by a detached LLM subprocess. Removed alongside the auto-
+ * classifier deletion — the agent classifies utterances inline per
+ * CLAUDE.md, and the heartbeat reminds it to re-anchor periodically.
+ */
+import * as crypto from "node:crypto";
+import { promises as fs } from "node:fs";
+import * as path from "node:path";
+import { resolveDataRoot } from "../codex/store.js";
+import { consumePendingHeartbeat, markRecallRequired } from "./heartbeat.js";
+/**
+ * 0.7.10 (#164): minimum gap between consecutive UserPromptSubmit
+ * firings before we consider the session "resumed" rather than
+ * continuous. 5 minutes is short enough that a coffee-break doesn't
+ * trigger, long enough that genuine process restarts always do.
+ */
+const RESUME_GAP_MS = 5 * 60 * 1000;
+export async function runUserPromptSubmitHook() {
+    let raw = "";
+    for await (const chunk of process.stdin) {
+        raw += chunk;
+    }
+    if (!raw.trim())
+        process.exit(0);
+    let payload;
+    try {
+        payload = JSON.parse(raw);
+    }
+    catch {
+        process.exit(0);
+    }
+    const sessionId = payload.session_id;
+    if (!sessionId)
+        process.exit(0);
+    const out = [];
+    // 0.7.10 (#164): detect resumed sessions and inject a re-anchor
+    // prompt. The signal is "gap since last UPS firing for this session
+    // > RESUME_GAP_MS." First firing ever writes the marker without
+    // injecting (the session just started; no resume happened yet).
+    const resumeMsg = await detectResumeAndUpdateMarker(sessionId);
+    if (resumeMsg)
+        out.push(resumeMsg);
+    // #112-audit finding 1: read+clear is racy if a writer appends concurrently.
+    // Rename-then-read atomically claims the file contents — any bytes that
+    // arrive after the rename land in a fresh file the next consumer will pick up.
+    const broken = await consumeJsonl(path.join(resolveDataRoot(), "sessions", sessionId, "broken-promises.jsonl"));
+    if (broken.length > 0) {
+        out.push("🦑 [opensquid honesty-ledger] unresolved claims from the previous turn:");
+        for (const p of broken) {
+            out.push(`  🦑 ${p.claim_id}: "${p.matched_text}" — needed ${p.claim_label}`);
+        }
+        out.push("Acknowledge these in your reply: either do the missing action now, or " +
+            "retract the claim explicitly. Don't repeat the pattern.");
+    }
+    // #124: heartbeat nudge surfaces here when Stop hook armed one. The agent
+    // sees this at the top of its context for the new turn and acts on it
+    // inline (calls recall, scans for substantive recent user turns, calls
+    // memorize/remember/promote per CLAUDE.md classify-and-act).
+    // 0.7.27 / D8 — surface a plan-mirror reminder when the user's
+    // prompt contains multiple task identifiers in sequence. Catches the
+    // "166 then 168" → agent does 166 + defers 168 misread.
+    if (typeof payload.prompt === "string") {
+        const mirror = detectMultiTaskDirective(payload.prompt);
+        if (mirror) {
+            if (out.length > 0)
+                out.push("");
+            out.push(mirror);
+        }
+    }
+    const heartbeat = await consumePendingHeartbeat(sessionId);
+    if (heartbeat) {
+        if (out.length > 0)
+            out.push("");
+        out.push(heartbeat);
+        // 0.7.26 / D7 — set the recall-required flag. pre-tool-use will
+        // block any mcp__opensquid__* tool call (other than recall) until
+        // the agent actually calls recall. Catches the "heartbeat fires,
+        // agent acknowledges, continues without complying" drift.
+        try {
+            await markRecallRequired(sessionId);
+        }
+        catch (err) {
+            process.stderr.write(`[opensquid hook user-prompt-submit] markRecallRequired failed (non-fatal): ${err instanceof Error ? err.message : err}\n`);
+        }
+    }
+    if (out.length > 0) {
+        process.stdout.write(out.join("\n") + "\n");
+    }
+    process.exit(0);
+}
+/**
+ * 0.7.27 / D8 — detect a multi-task directive in the user's prompt
+ * and return a "mirror back your parsed plan" reminder message.
+ *
+ * Trigger patterns (case-insensitive):
+ *   - "<num1> then <num2>" — bare-number sequencing (the D8 incident
+ *     shape: user said "166 then 168" — agent did 166 + deferred 168)
+ *   - "first <ref> then <ref>"
+ *   - "after <ref> do <ref>" / "after X then Y"
+ *   - Two or more `#<num>` references
+ *
+ * Returns the surface message when a match fires, null otherwise.
+ * Exported for direct testing.
+ */
+export function detectMultiTaskDirective(prompt) {
+    const refs = extractTaskRefs(prompt);
+    if (refs.length < 2)
+        return null;
+    return (`🦑 [opensquid] multi-task directive detected (refs: ${refs.slice(0, 5).join(", ")}). ` +
+        `Per [[feedback_user_words_have_top_weight]] + drift D8: BEFORE executing, ` +
+        `mirror back your parsed plan ("read as: do X, then do Y") so we catch a ` +
+        `misread before it ships. Don't auto-defer items the user listed in parallel.`);
+}
+/**
+ * Extract probable task references from a user prompt. Returns the
+ * distinct references in document order, capped at 10.
+ *
+ * Heuristics (intentionally narrow to keep false-positives low):
+ *   - `#\d+` shapes always count
+ *   - bare 2-4-digit numbers count IF they're connected by a
+ *     sequencing word ("then" / "after" / "first" / "and then")
+ *
+ * Exported for testing.
+ */
+export function extractTaskRefs(prompt) {
+    const refs = [];
+    const seen = new Set();
+    // Pass 1: explicit #N references
+    for (const m of prompt.matchAll(/#\d+/g)) {
+        if (!seen.has(m[0])) {
+            refs.push(m[0]);
+            seen.add(m[0]);
+        }
+    }
+    // Pass 2: bare-number sequences via "then" / "after" / "first ... then"
+    // Pattern: two 2-4-digit numbers separated by "then"/"after"/"and then".
+    for (const m of prompt.matchAll(/\b(\d{2,4})\s*(?:,\s*|\s+(?:then|after|and then|and)\s+)(\d{2,4})\b/gi)) {
+        for (const num of [m[1], m[2]]) {
+            const key = `#${num}`;
+            if (!seen.has(key)) {
+                refs.push(key);
+                seen.add(key);
+            }
+        }
+    }
+    return refs.slice(0, 10);
+}
+/**
+ * 0.7.10 (#164): detect resumed sessions by tracking the wall-clock
+ * gap between consecutive UPS firings. Returns a re-anchor message
+ * when a gap exceeds RESUME_GAP_MS, OR null when continuous /
+ * first-ever firing.
+ *
+ * Marker file: ~/.opensquid/sessions/<sid>/ups-last-at.txt
+ *   Contents: ISO 8601 timestamp of the last UPS firing.
+ *
+ * On EVERY call: read prior timestamp → write current timestamp.
+ * First call: marker missing → write current; return null (no resume
+ * happened, just the session starting).
+ * Subsequent call: gap < RESUME_GAP_MS → continuous (return null).
+ * Subsequent call: gap >= RESUME_GAP_MS → resumed (return message).
+ *
+ * Exported for direct testing.
+ */
+export async function detectResumeAndUpdateMarker(sessionId, options = {}) {
+    const root = resolveDataRoot(options.dataRoot);
+    const dir = path.join(root, "sessions", sessionId);
+    const markerPath = path.join(dir, "ups-last-at.txt");
+    const nowMs = options.now ?? Date.now();
+    let prior = null;
+    try {
+        const raw = (await fs.readFile(markerPath, "utf8")).trim();
+        const parsed = Date.parse(raw);
+        if (Number.isFinite(parsed))
+            prior = parsed;
+    }
+    catch {
+        /* no marker — first firing */
+    }
+    await fs.mkdir(dir, { recursive: true });
+    await fs.writeFile(markerPath, new Date(nowMs).toISOString() + "\n", "utf8");
+    if (prior === null)
+        return null; // first firing for this session
+    const gapMs = nowMs - prior;
+    if (gapMs < RESUME_GAP_MS)
+        return null;
+    const gapMin = Math.round(gapMs / 60000);
+    return (`🦑 [opensquid] Session resumed (${gapMin}m since last activity). ` +
+        `Before continuing, re-anchor: call \`recall\` for the active task, ` +
+        `scan recent assistant turns for any unfulfilled commitments, and ` +
+        `re-read any locked rule the next action would touch.`);
+}
+/**
+ * Atomically claim a JSONL accumulator file: rename it to a unique
+ * sibling, then read+parse, then delete the renamed file. Any writer
+ * that opens the original path after the rename starts a fresh file
+ * that the next consumer will pick up.
+ */
+async function consumeJsonl(filePath) {
+    const claimed = `${filePath}.consuming.${crypto.randomUUID()}`;
+    try {
+        await fs.rename(filePath, claimed);
+    }
+    catch {
+        // ENOENT — nothing to consume
+        return [];
+    }
+    let raw;
+    try {
+        raw = await fs.readFile(claimed, "utf8");
+    }
+    catch {
+        raw = "";
+    }
+    try {
+        await fs.rm(claimed);
+    }
+    catch {
+        // already gone
+    }
+    if (!raw.trim())
+        return [];
+    const items = [];
+    for (const line of raw.split("\n")) {
+        const t = line.trim();
+        if (!t)
+            continue;
+        try {
+            items.push(JSON.parse(t));
+        }
+        catch {
+            // skip malformed line
+        }
+    }
+    return items;
+}
+//# sourceMappingURL=user-prompt-submit.js.map

package/dist/hooks/user-prompt-submit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"user-prompt-submit.js","sourceRoot":"","sources":["../../src.legacy/hooks/user-prompt-submit.ts"],"names":[],"mappings":"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"}

package/dist/hooks/user-prompt-submit.test.js

@@ -0,0 +1,118 @@
+/**
+ * Tests for UserPromptSubmit hook helpers — focused on the resume-
+ * detection logic added in 0.7.10 (#164).
+ */
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import * as crypto from "node:crypto";
+import { promises as fs } from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { detectMultiTaskDirective, detectResumeAndUpdateMarker, extractTaskRefs, } from "./user-prompt-submit.js";
+let tmpRoot;
+const SESSION = "test-session";
+beforeEach(async () => {
+    tmpRoot = path.join(os.tmpdir(), `oscli-ups-${crypto.randomUUID()}`);
+    await fs.mkdir(tmpRoot, { recursive: true });
+});
+afterEach(async () => {
+    await fs.rm(tmpRoot, { recursive: true, force: true });
+});
+describe("detectResumeAndUpdateMarker (#164)", () => {
+    it("returns null on first firing (no marker yet) but creates the marker", async () => {
+        const now = Date.parse("2026-05-17T10:00:00Z");
+        const msg = await detectResumeAndUpdateMarker(SESSION, { dataRoot: tmpRoot, now });
+        expect(msg).toBeNull();
+        // Marker should exist with current timestamp.
+        const written = await fs.readFile(path.join(tmpRoot, "sessions", SESSION, "ups-last-at.txt"), "utf8");
+        expect(written.trim()).toBe(new Date(now).toISOString());
+    });
+    it("returns null when gap < 5 minutes (continuous session)", async () => {
+        const first = Date.parse("2026-05-17T10:00:00Z");
+        await detectResumeAndUpdateMarker(SESSION, { dataRoot: tmpRoot, now: first });
+        const second = first + 60 * 1000; // 1 minute later
+        const msg = await detectResumeAndUpdateMarker(SESSION, { dataRoot: tmpRoot, now: second });
+        expect(msg).toBeNull();
+    });
+    it("returns a resume message when gap >= 5 minutes", async () => {
+        const first = Date.parse("2026-05-17T10:00:00Z");
+        await detectResumeAndUpdateMarker(SESSION, { dataRoot: tmpRoot, now: first });
+        const second = first + 6 * 60 * 1000; // 6 minutes later
+        const msg = await detectResumeAndUpdateMarker(SESSION, { dataRoot: tmpRoot, now: second });
+        expect(msg).not.toBeNull();
+        expect(msg).toContain("Session resumed");
+        expect(msg).toContain("6m");
+        expect(msg).toContain("re-anchor");
+        expect(msg).toContain("recall");
+    });
+    it("returns a resume message after a long gap (hours)", async () => {
+        const first = Date.parse("2026-05-17T00:00:00Z");
+        await detectResumeAndUpdateMarker(SESSION, { dataRoot: tmpRoot, now: first });
+        const second = first + 8 * 60 * 60 * 1000; // 8 hours later
+        const msg = await detectResumeAndUpdateMarker(SESSION, { dataRoot: tmpRoot, now: second });
+        expect(msg).not.toBeNull();
+        expect(msg).toContain("480m"); // 8h * 60min
+    });
+    it("updates the marker on every firing (so next gap is measured from the most-recent)", async () => {
+        const t0 = Date.parse("2026-05-17T10:00:00Z");
+        await detectResumeAndUpdateMarker(SESSION, { dataRoot: tmpRoot, now: t0 });
+        const t1 = t0 + 60_000;
+        await detectResumeAndUpdateMarker(SESSION, { dataRoot: tmpRoot, now: t1 });
+        const written = await fs.readFile(path.join(tmpRoot, "sessions", SESSION, "ups-last-at.txt"), "utf8");
+        expect(written.trim()).toBe(new Date(t1).toISOString());
+    });
+    it("returns null at exactly the 5-minute boundary (just under)", async () => {
+        const first = Date.parse("2026-05-17T10:00:00Z");
+        await detectResumeAndUpdateMarker(SESSION, { dataRoot: tmpRoot, now: first });
+        const second = first + 5 * 60 * 1000 - 1; // 4m59.999s
+        const msg = await detectResumeAndUpdateMarker(SESSION, { dataRoot: tmpRoot, now: second });
+        expect(msg).toBeNull();
+    });
+    it("tolerates a corrupt marker file (returns null, overwrites)", async () => {
+        const dir = path.join(tmpRoot, "sessions", SESSION);
+        await fs.mkdir(dir, { recursive: true });
+        await fs.writeFile(path.join(dir, "ups-last-at.txt"), "not a date", "utf8");
+        const now = Date.parse("2026-05-17T10:00:00Z");
+        const msg = await detectResumeAndUpdateMarker(SESSION, { dataRoot: tmpRoot, now });
+        expect(msg).toBeNull();
+        // Should still have written the new timestamp.
+        const written = await fs.readFile(path.join(dir, "ups-last-at.txt"), "utf8");
+        expect(written.trim()).toBe(new Date(now).toISOString());
+    });
+    it("isolates per-session (gap on session A doesn't affect session B)", async () => {
+        const t0 = Date.parse("2026-05-17T10:00:00Z");
+        await detectResumeAndUpdateMarker("A", { dataRoot: tmpRoot, now: t0 });
+        // Session B's first firing 6h later — still its FIRST firing, so null.
+        const tLater = t0 + 6 * 60 * 60 * 1000;
+        const msgB = await detectResumeAndUpdateMarker("B", { dataRoot: tmpRoot, now: tLater });
+        expect(msgB).toBeNull();
+    });
+});
+describe("detectMultiTaskDirective — D8 (0.7.27)", () => {
+    it("fires on '166 then 168' (bare-number sequencing — D8 incident shape)", () => {
+        const m = detectMultiTaskDirective("166 then 168");
+        expect(m).not.toBeNull();
+        expect(m).toContain("#166");
+        expect(m).toContain("#168");
+    });
+    it("fires on '#171 then #172' (explicit references)", () => {
+        expect(detectMultiTaskDirective("#171 then #172")).not.toBeNull();
+    });
+    it("fires on '166, 168' comma-separated", () => {
+        expect(detectMultiTaskDirective("166, 168")).not.toBeNull();
+    });
+    it("does NOT fire on a single task reference", () => {
+        expect(detectMultiTaskDirective("work on #170")).toBeNull();
+        expect(detectMultiTaskDirective("can you do 168")).toBeNull();
+    });
+    it("does NOT fire on unrelated number prose", () => {
+        // No sequencing connector → no D8 risk.
+        expect(detectMultiTaskDirective("we shipped 5 patches in 30 minutes")).toBeNull();
+    });
+    it("extractTaskRefs returns refs in document order", () => {
+        expect(extractTaskRefs("166 then 168")).toEqual(["#166", "#168"]);
+        expect(extractTaskRefs("#171 and #172")).toEqual(["#171", "#172"]);
+    });
+    it("extractTaskRefs dedupes references", () => {
+        expect(extractTaskRefs("#170 then #170")).toEqual(["#170"]);
+    });
+});

package/dist/hooks/versioning-gate.d.ts

@@ -0,0 +1,101 @@
+/**
+ * Versioning gate — pre-commit check enforcing per-commit patch bumps
+ * (v0.6.3). Wired into the PreToolUse hook for `git commit` commands.
+ *
+ * Problem this fixes: I keep batching multiple fixes into one commit
+ * and bumping the minor (or no bump at all) instead of one patch per
+ * fix. The discipline rule was memorized (`mem-d2cc0e78`) but rules
+ * I can ignore aren't structural protection. This gate makes the
+ * discipline mechanical — if your commit touches source code AND
+ * doesn't include a manifest version bump in the same commit, it
+ * gets rejected before `git commit` runs.
+ *
+ * Detection:
+ *   1. `git diff --cached --name-only` → list of staged files
+ *   2. If no `src/**` files staged → allow (docs/CI/config commits
+ *      don't need version bumps)
+ *   3. If `src/**` files staged → require a manifest (Cargo.toml or
+ *      package.json) to also be staged with a `version` line diff
+ *   4. Otherwise → block with actionable message
+ *
+ * Fail-open invariant: any error running git or parsing output →
+ * allow with a stderr warning (per the honesty-ledger + workflow-gate
+ * precedent — never block on opensquid's own bug).
+ *
+ * Emergency override: `OPENSQUID_SKIP_VERSION_GATE=1` bypasses with a
+ * loud stderr warning. For genuine emergencies (revert commits,
+ * generated-code-only diffs, etc.) where the discipline doesn't
+ * apply.
+ */
+export interface VersioningGateInput {
+    /** Working directory (the repo root). Defaults to process.cwd(). */
+    cwd?: string;
+}
+export interface VersioningGateResult {
+    /** True when the commit should be blocked. */
+    block: boolean;
+    /** Stderr message — always present when stderr should be written.
+     * Non-blocking warnings also use this. */
+    stderr: string;
+}
+export declare function evaluateVersioningGate(input?: VersioningGateInput): Promise<VersioningGateResult>;
+/**
+ * Is this a source file that should trigger version-bump enforcement?
+ * Generous definition: anything under `src/` for any language we support.
+ */
+export declare function isSourceFile(p: string): boolean;
+/** Is this the repo's version manifest? */
+export declare function isManifestFile(p: string): boolean;
+/**
+ * Parsed version jump from a manifest's staged diff.
+ *
+ * 0.7.23 / D5 — added so the gate can surface multi-patch catch-up
+ * jumps (e.g. 0.7.10 → 0.7.14) which indicate previous src commits
+ * shipped without bumps.
+ */
+export interface VersionJump {
+    from: string;
+    to: string;
+}
+/**
+ * Look at the staged diff of a manifest and return the version jump
+ * (from → to). Returns null when the diff doesn't touch a `version`
+ * line at all.
+ *
+ * Exported for direct testing.
+ */
+export declare function readManifestVersionBump(cwd: string, manifestPath: string): Promise<VersionJump | null>;
+/**
+ * Parse `+`/`-` lines from a manifest diff and extract the version
+ * jump. Cargo: `version = "..."`. package.json: `"version": "..."`.
+ *
+ * Anchor discipline:
+ *   - Cargo (TOML, line-oriented) → anchor `^version` so we don't
+ *     match a dep with `version = "..."` in `[dependencies.foo]`.
+ *   - package.json (JSON, can be MINIFIED single-line) → do NOT
+ *     anchor; `"version"` can appear mid-line in minified JSON.
+ *
+ * Exported for direct testing.
+ */
+export declare function parseVersionJumpFromDiff(diff: string): VersionJump | null;
+/**
+ * Detect a multi-patch jump: same major.minor, but patch advances by
+ * more than 1 (catch-up bump).
+ *
+ * Returns false for:
+ *   - First-time bumps (from === "")
+ *   - Same-patch (no actual jump, shouldn't happen with proper diff)
+ *   - Minor/major bumps (those are user-authorized; PATCH-ONLY rule
+ *     forbids the agent from naming them but doesn't make them "drift")
+ *   - Non-SemVer version strings (best-effort parse)
+ *
+ * Exported for direct testing.
+ */
+export declare function isMultiPatchJump(jump: VersionJump): boolean;
+/**
+ * Emergency-override env var. Loud stderr warning on bypass so it
+ * always shows up in scrollback / CI logs. Exported for the test
+ * suite.
+ */
+export declare function checkOverrideEnv(): boolean;
+//# sourceMappingURL=versioning-gate.d.ts.map

package/dist/hooks/versioning-gate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"versioning-gate.d.ts","sourceRoot":"","sources":["../../src.legacy/hooks/versioning-gate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAOH,MAAM,WAAW,mBAAmB;IAClC,oEAAoE;IACpE,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,oBAAoB;IACnC,8CAA8C;IAC9C,KAAK,EAAE,OAAO,CAAC;IACf;8CAC0C;IAC1C,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,sBAAsB,CAC1C,KAAK,GAAE,mBAAwB,GAC9B,OAAO,CAAC,oBAAoB,CAAC,CAsF/B;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAG/C;AAED,2CAA2C;AAC3C,wBAAgB,cAAc,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAGjD;AAED;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ;AAED;;;;;;GAMG;AACH,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAY7B;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAuBzE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAQ3D;AAmCD;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAE1C"}