@sema-agent/server 7.93.4 → 7.93.6

package/dist/plugins/one-time-migrations.js

@@ -1,16 +1,20 @@
 import { acquireEnsureSchemaLock, releaseEnsureSchemaLock } from "./tidb-pool.js";
 import { acquirePgEnsureSchemaLock, releasePgEnsureSchemaLock } from "./pg-pool.js";
+import { jsonColumnTextExpr } from "./sql-json-column.js";
 export const NO_SQL_MIGRATIONS = {
     retiredSnapshotTable: "absent",
     retiredSnapshotRows: 0,
-    retiredSteerSeatColumn: "absent",
     retiredSteerSeatStaleRows: 0,
+    retiredSteerSeatColumn: "absent",
+    auditDetailJsonNullRows: 0,
 };
 const RETIRED_SNAPSHOT_TABLE = "snapshot_manifest";
 const RETIRED_STEER_SEAT_COLUMN = "pending_steer";
 const DELIVERABLE_STEER_SEAT_WHERE = "(status = 'pending' OR (status = 'resolved' AND execution_outcome IS NULL))";
 const RETIRED_ASK_ORIGIN = { from: "unresolvable", to: "ancestor_marked" };
 const GATE_BEARING_LEDGER_EVENT_TYPE = "tool_end";
+const AUDIT_TABLE = "device_audit";
+const AUDIT_DETAIL_COLUMN = "detail";
 export class RetiredSteerSeatError extends Error {
     rows;
     code = "checkpoint.pending_steer_seat_retired";
@@ -130,6 +134,11 @@ async function migrateOn(db, dialect) {
                 `WHERE type = '${GATE_BEARING_LEDGER_EVENT_TYPE}' AND data->'gate'->>'origin' = '${RETIRED_ASK_ORIGIN.from}'`)) +
                 (await db.exec(`UPDATE checkpoint SET execution_outcome = jsonb_set(execution_outcome, '{origin}', '"${RETIRED_ASK_ORIGIN.to}"') ` +
                     `WHERE execution_outcome->>'origin' = '${RETIRED_ASK_ORIGIN.from}'`));
+    const auditTablePresent = await tableExists(db, dialect, AUDIT_TABLE);
+    const auditDetailJsonNullRows = !auditTablePresent
+        ? 0
+        : await db.exec(`UPDATE ${AUDIT_TABLE} SET ${AUDIT_DETAIL_COLUMN} = NULL ` +
+            `WHERE ${AUDIT_DETAIL_COLUMN} IS NOT NULL AND ${jsonColumnTextExpr(dialect, AUDIT_DETAIL_COLUMN)} = 'null'`);
     let retiredSnapshotTable = "absent";
     let retiredSnapshotRows = 0;
     let retiredSteerSeatColumn = "absent";
@@ -160,7 +169,7 @@ async function migrateOn(db, dialect) {
         throw new Error(`one-time migration failed AFTER completing destructive steps — record these before retrying, a retry cannot ` +
             `report them again: ${destroyed.join("; ")}. Underlying failure: ${e instanceof Error ? e.message : String(e)}`, { cause: e });
     }
-    return { retiredSnapshotTable, retiredSnapshotRows, retiredSteerSeatColumn, retiredSteerSeatStaleRows, askOriginRowsMigrated };
+    return { retiredSnapshotTable, retiredSnapshotRows, retiredSteerSeatColumn, retiredSteerSeatStaleRows, askOriginRowsMigrated, auditDetailJsonNullRows };
 }
 export function migrateRetiredAskOrigin(type, data) {
     if (type !== GATE_BEARING_LEDGER_EVENT_TYPE)
@@ -177,7 +186,7 @@ export function migrateRetiredAskOrigin(type, data) {
     return { ...d, gate: { ...g, origin: RETIRED_ASK_ORIGIN.to } };
 }
 export function logOneTimeMigrations(log, backend, report) {
-    const changed = report.retiredSnapshotTable === "dropped" || report.retiredSteerSeatColumn === "dropped" || report.askOriginRowsMigrated > 0;
+    const changed = report.retiredSnapshotTable === "dropped" || report.retiredSteerSeatColumn === "dropped" || report.askOriginRowsMigrated > 0 || report.auditDetailJsonNullRows > 0;
     (changed ? log.warn : log.info).call(log, "one_time_migrations_applied", {
         backend,
         retiredSnapshotTable: report.retiredSnapshotTable,
@@ -185,8 +194,11 @@ export function logOneTimeMigrations(log, backend, report) {
         retiredSteerSeatColumn: report.retiredSteerSeatColumn,
         retiredSteerSeatStaleRows: report.retiredSteerSeatStaleRows,
         askOriginRowsMigrated: report.askOriginRowsMigrated,
+        auditDetailJsonNullRows: report.auditDetailJsonNullRows,
         note: "one-time persisted-data migrations for this version's retirements (retired whole-tree snapshot index table " +
-            "dropped; retired single-seat steering column dropped; retired ask-origin spelling rewritten in place). This " +
+            "dropped; retired single-seat steering column dropped; retired ask-origin spelling rewritten in place; audit " +
+            "details written as the JSON text `null` by an earlier version folded to a SQL NULL, so \"no detail\" has exactly " +
+            "one on-disk spelling). This " +
             "whole migration step is removed in the next minor — start this version at least once before upgrading past it.",
     });
 }

package/dist/plugins/permission-rule-store-sql.d.ts

@@ -157,6 +157,7 @@ export declare class SqlRuleApprovalRecordStore implements RuleApprovalRecordSto
     private q;
     private enc;
     get(id: string): Promise<RuleApprovalRecord | StaleRuleApprovalRecord | undefined>;
+    private readApprovalRow;
     create(record: RuleApprovalRecord): Promise<void>;
     /**
      * 丢弃一条**从未被确认**的记录(codex 交叉复审 round8 [medium],可控半场)。

package/dist/plugins/permission-rule-store-sql.js

@@ -6,6 +6,7 @@ import { isMissingColumnError } from "./sql-errors.js";
 import { canonicalJson } from "../canonical-json.js";
 import { EDITED_RULE_BREADTH_WARNING_CODES, PERSISTED_RULE_MATCHES, isPersistedRuleTool, RULE_APPROVAL_RECORD_SCHEMA, UNCOVERED_SEGMENT_REASONS } from "../permission-rule-vocab.js";
 import { ensureIndexes } from "./ensure-index.js";
+import { createZodColumnReader, decodeJsonColumn, foldJsonColumn, jsonColumnText, readJsonObjectColumn } from "./sql-json-column.js";
 export function writerOfSqlRuleStore(store) {
     const w = Reflect.get(store, PERMISSION_RULE_WRITER);
     if (w === null || typeof w !== "object")
@@ -211,7 +212,7 @@ export async function ensureTiDBPermissionRuleSchema(pool) {
 }
 export async function assertPermissionRuleApprovalSchema(query, dialect) {
     try {
-        await query(`SELECT command, edited_json, version, offers_json, selected_offer FROM ${PERMISSION_RULE_APPROVAL_TABLE} WHERE 1=0`);
+        await query(`SELECT command, ${jsonColumnText(dialect, "edited_json")}, version, ${jsonColumnText(dialect, "offers_json")}, selected_offer FROM ${PERMISSION_RULE_APPROVAL_TABLE} WHERE 1=0`);
     }
     catch (err) {
         if (!isMissingColumnError(err, dialect))
@@ -231,7 +232,7 @@ export async function assertPermissionRuleApprovalSchema(query, dialect) {
 }
 export async function assertPermissionRuleTicketSchema(query, dialect) {
     try {
-        await query(`SELECT redeemed_outcome, claim_id, purpose, settled_at_ms FROM ${PERMISSION_RULE_TICKET_TABLE} WHERE 1=0`);
+        await query(`SELECT ${jsonColumnText(dialect, "redeemed_outcome")}, claim_id, purpose, settled_at_ms FROM ${PERMISSION_RULE_TICKET_TABLE} WHERE 1=0`);
     }
     catch (err) {
         if (!isMissingColumnError(err, dialect))
@@ -332,21 +333,21 @@ export function buildRuleBucketChecksum(body) {
 }
 const NEXT_DOT_MAX_ATTEMPTS = 8;
 const EMPTY_BUCKET = { actor: "", counter: 0, rev: 0, rules: [], tombstones: [], quarantined: [] };
-function parseColumn(schema, raw, column, ownerKey) {
-    const text = typeof raw === "string" ? raw : raw === null || raw === undefined ? undefined : String(raw);
-    if (text === undefined)
-        throw new Error(`permission_rule.${column} is absent for bucket ${ownerKey}; refusing to guess its content`);
-    let json;
+const readRulesJson = createZodColumnReader(z.array(PersistedRuleRowSchema));
+const readTombstonesJson = createZodColumnReader(z.array(RuleTombstoneSchema));
+const readQuarantinedJson = createZodColumnReader(z.array(QuarantinedRuleAddRowSchema));
+const readObservedVectorJson = createZodColumnReader(FrontierSchema);
+const readCandidatesJson = createZodColumnReader(z.array(RuleCandidateSchema));
+const readOffersJson = createZodColumnReader(z.array(RuleOffer2Schema));
+const readRedeemedDotsJson = createZodColumnReader(RedeemedDotsSchema);
+const readEditedJson = createZodColumnReader(RuleEditedSchema);
+async function refusingUnreadableColumns(what, fn) {
     try {
-        json = JSON.parse(text);
+        return await fn();
     }
-    catch (err) {
-        throw new Error(`permission_rule.${column} for bucket ${ownerKey} is not valid JSON (${err instanceof Error ? err.message : String(err)})`);
+    catch (e) {
+        throw foldJsonColumn(e, (m) => new Error(`${m} — the ${what} does not carry a readable shape; refusing the whole of it rather than report a partial one`));
     }
-    const parsed = schema.safeParse(json);
-    if (!parsed.success)
-        throw new Error(`permission_rule.${column} for bucket ${ownerKey} does not carry a readable shape: ${parsed.error.message}`);
-    return parsed.data;
 }
 class SqlDurableRulePartition {
     db;
@@ -368,14 +369,18 @@ class SqlDurableRulePartition {
         return this.db.dialect === "tidb" ? tidbSql : pgSql;
     }
     async read() {
-        const { rows } = await this.db.query(this.q(`SELECT actor, counter, rev, rules_json, tombstones_json, quarantined_json, observed_vector_json, checksum FROM ${PERMISSION_RULE_TABLE} WHERE owner_key = ?`, `SELECT actor, counter, rev, rules_json, tombstones_json, quarantined_json, observed_vector_json, checksum FROM ${PERMISSION_RULE_TABLE} WHERE owner_key = $1`), [this.ownerKey]);
+        return refusingUnreadableColumns(`bucket ${this.ownerKey}`, () => this.readBucketRow());
+    }
+    async readBucketRow() {
+        const { rows } = await this.db.query(this.q(`SELECT actor, counter, rev, ${jsonColumnText("tidb", "rules_json")}, ${jsonColumnText("tidb", "tombstones_json")}, ${jsonColumnText("tidb", "quarantined_json")}, ${jsonColumnText("tidb", "observed_vector_json")}, checksum FROM ${PERMISSION_RULE_TABLE} WHERE owner_key = ?`, `SELECT actor, counter, rev, ${jsonColumnText("pg", "rules_json")}, ${jsonColumnText("pg", "tombstones_json")}, ${jsonColumnText("pg", "quarantined_json")}, ${jsonColumnText("pg", "observed_vector_json")}, checksum FROM ${PERMISSION_RULE_TABLE} WHERE owner_key = $1`), [this.ownerKey]);
         const row = rows[0];
         if (row === undefined)
             return { ...EMPTY_BUCKET, rules: [], tombstones: [], quarantined: [] };
-        const rulesRaw = parseColumn(z.array(PersistedRuleRowSchema), row.rules_json, "rules_json", this.ownerKey);
-        const tombstonesRaw = parseColumn(z.array(RuleTombstoneSchema), row.tombstones_json, "tombstones_json", this.ownerKey);
-        const quarantinedRaw = parseColumn(z.array(QuarantinedRuleAddRowSchema), row.quarantined_json, "quarantined_json", this.ownerKey);
-        const observedVector = row.observed_vector_json === null || row.observed_vector_json === undefined ? undefined : parseColumn(FrontierSchema, row.observed_vector_json, "observed_vector_json", this.ownerKey);
+        const at = `${PERMISSION_RULE_TABLE} bucket ${this.ownerKey}`;
+        const rulesRaw = decodeJsonColumn(row.rules_json, readRulesJson, `${at}.rules_json`);
+        const tombstonesRaw = decodeJsonColumn(row.tombstones_json, readTombstonesJson, `${at}.tombstones_json`);
+        const quarantinedRaw = decodeJsonColumn(row.quarantined_json, readQuarantinedJson, `${at}.quarantined_json`);
+        const observedVector = row.observed_vector_json === null || row.observed_vector_json === undefined ? undefined : decodeJsonColumn(row.observed_vector_json, readObservedVectorJson, `${at}.observed_vector_json`);
         const expected = buildRuleBucketChecksum({ rules: rulesRaw, tombstones: tombstonesRaw, quarantined: quarantinedRaw, ...(observedVector !== undefined ? { observedVector } : {}) });
         if (String(row.checksum ?? "") !== expected) {
             throw new Error(`permission_rule bucket ${this.ownerKey} failed its integrity check (stored ${String(row.checksum)}, computed ${expected}) — ` +
@@ -548,7 +553,10 @@ export class SqlRuleApprovalRecordStore {
         return dialectProtocolJsonEncoder(this.db.dialect)(v, label);
     }
     async get(id) {
-        const { rows } = await this.db.query(this.q(`SELECT record_id, owner_kind, principal, kind, state, version, rev, candidates_json, offers_json, selected_offer, redeemed_dots_json, tool_call_id, bound_input_hash, command, edited_json, created_at_iso FROM ${PERMISSION_RULE_APPROVAL_TABLE} WHERE record_id = ?`, `SELECT record_id, owner_kind, principal, kind, state, version, rev, candidates_json, offers_json, selected_offer, redeemed_dots_json, tool_call_id, bound_input_hash, command, edited_json, created_at_iso FROM ${PERMISSION_RULE_APPROVAL_TABLE} WHERE record_id = $1`), [id]);
+        return refusingUnreadableColumns(`approval record ${id}`, () => this.readApprovalRow(id));
+    }
+    async readApprovalRow(id) {
+        const { rows } = await this.db.query(this.q(`SELECT record_id, owner_kind, principal, kind, state, version, rev, ${jsonColumnText("tidb", "candidates_json")}, ${jsonColumnText("tidb", "offers_json")}, selected_offer, ${jsonColumnText("tidb", "redeemed_dots_json")}, tool_call_id, bound_input_hash, command, ${jsonColumnText("tidb", "edited_json")}, created_at_iso FROM ${PERMISSION_RULE_APPROVAL_TABLE} WHERE record_id = ?`, `SELECT record_id, owner_kind, principal, kind, state, version, rev, ${jsonColumnText("pg", "candidates_json")}, ${jsonColumnText("pg", "offers_json")}, selected_offer, ${jsonColumnText("pg", "redeemed_dots_json")}, tool_call_id, bound_input_hash, command, ${jsonColumnText("pg", "edited_json")}, created_at_iso FROM ${PERMISSION_RULE_APPROVAL_TABLE} WHERE record_id = $1`), [id]);
         const row = rows[0];
         if (row === undefined)
             return undefined;
@@ -558,10 +566,11 @@ export class SqlRuleApprovalRecordStore {
         if (Number(row.version) !== RULE_APPROVAL_RECORD_SCHEMA) {
             return { staleSchema: true, id: String(row.record_id), ...identity };
         }
-        const candidates = parseColumn(z.array(RuleCandidateSchema), row.candidates_json, "candidates_json", id);
-        const offers = parseColumn(z.array(RuleOffer2Schema), row.offers_json, "offers_json", id);
-        const dotsRaw = row.redeemed_dots_json === null || row.redeemed_dots_json === undefined ? undefined : parseColumn(RedeemedDotsSchema, row.redeemed_dots_json, "redeemed_dots_json", id);
-        const edited = row.edited_json === null || row.edited_json === undefined ? undefined : parseColumn(RuleEditedSchema, row.edited_json, "edited_json", id);
+        const at = `${PERMISSION_RULE_APPROVAL_TABLE} row ${id}`;
+        const candidates = decodeJsonColumn(row.candidates_json, readCandidatesJson, `${at}.candidates_json`);
+        const offers = decodeJsonColumn(row.offers_json, readOffersJson, `${at}.offers_json`);
+        const dotsRaw = row.redeemed_dots_json === null || row.redeemed_dots_json === undefined ? undefined : decodeJsonColumn(row.redeemed_dots_json, readRedeemedDotsJson, `${at}.redeemed_dots_json`);
+        const edited = row.edited_json === null || row.edited_json === undefined ? undefined : decodeJsonColumn(row.edited_json, readEditedJson, `${at}.edited_json`);
         const kind = z.enum(["card", "import", "starter"]).safeParse(row.kind);
         const state = z.enum(["pending", "approved", "redeemed"]).safeParse(row.state);
         if (!kind.success || !state.success) {
@@ -716,10 +725,10 @@ export class SqlRuleImportTicketStore {
         if (row.redeemedOutcome !== undefined) {
             let outcome;
             try {
-                outcome = JSON.parse(row.redeemedOutcome);
+                outcome = decodeJsonColumn(row.redeemedOutcome, readJsonObjectColumn, `${PERMISSION_RULE_TICKET_TABLE}.redeemed_outcome for ticket ${ticketId}`);
             }
-            catch (err) {
-                throw new Error(`${PERMISSION_RULE_TICKET_TABLE}.redeemed_outcome for ticket ${ticketId} is not valid JSON (${err instanceof Error ? err.message : String(err)})`);
+            catch (e) {
+                throw foldJsonColumn(e, (m) => new Error(`${m} — refusing rather than read a settled ticket as still open (which re-runs a redemption that already ran)`));
             }
             return { state: "settled", outcome };
         }
@@ -738,7 +747,7 @@ export class SqlRuleImportTicketStore {
         return affected === 1 ? { ok: true, approvalId: row.approvalId, payloadHash: row.payloadHash, claimId } : { ok: false };
     }
     async readRow(ticketId) {
-        const { rows } = await this.db.query(this.q(`SELECT owner_key, approval_id, payload_hash, purpose, expires_at_ms, consumed_at_ms, claim_id, redeemed_outcome, ${SQL_DB_NOW_MS.tidb} AS db_now_ms FROM ${PERMISSION_RULE_TICKET_TABLE} WHERE ticket_id = ?`, `SELECT owner_key, approval_id, payload_hash, purpose, expires_at_ms, consumed_at_ms, claim_id, redeemed_outcome, ${SQL_DB_NOW_MS.pg} AS db_now_ms FROM ${PERMISSION_RULE_TICKET_TABLE} WHERE ticket_id = $1`), [ticketId]);
+        const { rows } = await this.db.query(this.q(`SELECT owner_key, approval_id, payload_hash, purpose, expires_at_ms, consumed_at_ms, claim_id, ${jsonColumnText("tidb", "redeemed_outcome")}, ${SQL_DB_NOW_MS.tidb} AS db_now_ms FROM ${PERMISSION_RULE_TICKET_TABLE} WHERE ticket_id = ?`, `SELECT owner_key, approval_id, payload_hash, purpose, expires_at_ms, consumed_at_ms, claim_id, ${jsonColumnText("pg", "redeemed_outcome")}, ${SQL_DB_NOW_MS.pg} AS db_now_ms FROM ${PERMISSION_RULE_TICKET_TABLE} WHERE ticket_id = $1`), [ticketId]);
         const row = rows[0];
         if (row === undefined)
             return undefined;

package/dist/plugins/remote-env-host.js

@@ -7,7 +7,7 @@ import { openSync, closeSync, readSync, statSync, truncateSync, unlinkSync, mkdi
 import { StringDecoder } from "node:string_decoder";
 import { armPipeDestroyGrace, numEnvOr, SYMLINK_CHAIN_MAX_HOPS } from "./remote-shell.js";
 import { hostBackgroundShellEnabled, hostExecSpoolEnabled } from "../config.js";
-import { resolveHostShell, hostShell, spawnGroupOptions, killTreeHard, killTreeSoft, collapseWin32EnvKeys, trackHostForegroundChild, untrackHostForegroundChild } from "./host-platform.js";
+import { resolveHostShell, hostShell, spawnGroupOptions, killTreeHard, killTreeSoft, collapseWin32EnvKeys, adoptHostForegroundChild } from "./host-platform.js";
 import { BackgroundShellManager, seedMemStream, feedMemStream, drainMemStream } from "./background-shell-support.js";
 import { FileError, ExecutionError, RemoteExecutionError, scrubSecretEnv, RollingTailBuffer, markTruncated, SchedulerError, BackgroundShellError, } from "@sema-agent/core";
 import { recordSecretEnvScrub } from "../observability/secret-env-scrub.js";
@@ -403,15 +403,12 @@ export class RemoteHostExecutionEnv {
                 env: this.mergeEnv(options?.env),
                 ...spawnGroupOptions(),
             });
-            const ticket = child.pid != null ? trackHostForegroundChild(child.pid) : undefined;
-            if (ticket)
-                child.once("exit", () => untrackHostForegroundChild(ticket));
+            const ticket = adoptHostForegroundChild(child);
             const finish = (r) => {
                 if (settled)
                     return;
                 settled = true;
-                if (ticket)
-                    untrackHostForegroundChild(ticket);
+                ticket?.release();
                 clearTimeout(timer);
                 options?.abortSignal?.removeEventListener("abort", onAbort);
                 removeDetachListener?.();
@@ -460,8 +457,7 @@ export class RemoteHostExecutionEnv {
                 if (forceSettleTimer)
                     clearTimeout(forceSettleTimer);
                 options?.abortSignal?.removeEventListener("abort", onAbort);
-                if (ticket)
-                    untrackHostForegroundChild(ticket);
+                ticket?.release();
                 settled = true;
                 resolve(ok({ stdout: seedOut, stderr: seedErr, exitCode: 0, detached: { shellId } }));
             };
@@ -621,8 +617,7 @@ export class RemoteHostExecutionEnv {
                     clearInterval(pump);
                     pump = undefined;
                 }
-                if (ticket)
-                    untrackHostForegroundChild(ticket);
+                ticket?.release();
                 if (drainTimer) {
                     clearTimeout(drainTimer);
                     drainTimer = undefined;
@@ -675,8 +670,7 @@ export class RemoteHostExecutionEnv {
                 cleanupSpool();
                 throw e;
             }
-            if (child.pid != null)
-                ticket = trackHostForegroundChild(child.pid);
+            ticket = adoptHostForegroundChild(child);
             closeSpoolFds();
             child.on("error", (e) => {
                 finish({ ok: false, error: new ExecutionError("spawn_error", `host spawn failed: ${e.message}`) });
@@ -765,8 +759,6 @@ export class RemoteHostExecutionEnv {
                 settleFromTermination(code, signal);
             });
             child.on("exit", (code, signal) => {
-                if (ticket)
-                    untrackHostForegroundChild(ticket);
                 exited = true;
                 drainTimer = setTimeout(() => settleFromTermination(code, signal), EXIT_SETTLE_DRAIN_MS);
                 drainTimer.unref?.();
@@ -811,9 +803,7 @@ export class RemoteHostExecutionEnv {
         const signalReady = () => { const w = wake; wake = undefined; w?.(); };
         const sh = hostShell();
         const child = spawn(sh.shell, [...sh.args, command], { cwd, env: this.mergeEnv(options?.env), ...spawnGroupOptions() });
-        const ticket = child.pid != null ? trackHostForegroundChild(child.pid) : undefined;
-        if (ticket)
-            child.once("exit", () => untrackHostForegroundChild(ticket));
+        const ticket = adoptHostForegroundChild(child);
         let pipeDestroyTimer;
         const kill = () => {
             try {
@@ -848,8 +838,7 @@ export class RemoteHostExecutionEnv {
         child.on("close", (code, signal) => {
             if (pipeDestroyTimer)
                 clearTimeout(pipeDestroyTimer);
-            if (ticket)
-                untrackHostForegroundChild(ticket);
+            ticket?.release();
             if (finished)
                 return;
             exitCode = code ?? (signal ? 128 + (signalNumber(signal) ?? 0) : 1);
@@ -925,8 +914,7 @@ export class RemoteHostExecutionEnv {
             if (wallTimer)
                 clearTimeout(wallTimer);
             options?.signal?.removeEventListener("abort", onAbort);
-            if (ticket)
-                untrackHostForegroundChild(ticket);
+            ticket?.release();
         }
     }
     async absolutePath(p) {

package/dist/plugins/run-store-sql.d.ts

@@ -124,7 +124,7 @@ export declare class SqlRunStore {
     getActiveTaskId(sessionId: string): Promise<string | undefined>;
     /** Shared row→record mapper — byte-identical between dialects (both drivers hand back the same column
      *  names + comparable JS types after SqlDriver's result normalization).
-     *  🔴 **读它的每一条查询都必须选 {@link RUN_ROW_COLS}**(S-230):映射器对「没被 SELECT 的列」是
+     *  🔴 **读它的每一条查询都必须选 {@link runRowCols}**(S-230):映射器对「没被 SELECT 的列」是
      *  结构性失明的 —— `undefined ?? null` 与 `Boolean(undefined)` 都会安静地铸出一个**看上去合法的假值**。
      *  修前 `listRuns` 的两条方言臂就漏选 `instance_id`,于是列表面的每一行 `instanceId` 恒 `null`
      *  (今天没有消费点,所以没人发现)。列表收成一个常量 = 这类漏选从此不可能发生。 */

package/dist/plugins/run-store-sql.js

@@ -3,11 +3,42 @@ import { outwardPlane } from "../terminal.js";
 import { projectUsageStats, USAGE_SCAN_LIMIT } from "../usage-analytics.js";
 import { escapeLike } from "./sql-escape.js";
 import { pgSanitizeText } from "./pg-safe-json.js";
-import { parseJsonLenient as parseJson, toIso as iso } from "./sql-row-helpers.js";
+import { toIso as iso } from "./sql-row-helpers.js";
+import { recordFailOpen } from "../observability/fail-open.js";
+import { createObjectColumnReader, decodeJsonColumn, decodeNullableJsonColumn, foldJsonColumn, isJsonColumnBodyProblem, jsonColumnText, readJsonObjectColumn, readNonNullJsonValueColumn } from "./sql-json-column.js";
 import { notifyRunTerminal, runTerminalLogLevel } from "../observability/run-terminal.js";
 import { mysqlDriver, pgDriver, dialectJsonEncoder } from "./sql-driver.js";
 import { isDupKeyError } from "./sql-errors.js";
-const RUN_ROW_COLS = "task_id, session_id, owner, status, result, error, error_code, job_id, source, instance_id, cancel_requested, objective_preview, created_at, updated_at";
+function runRowCols(dialect) {
+    return (`task_id, session_id, owner, status, ${jsonColumnText(dialect, "result")}, error, error_code, job_id, source, ` +
+        "instance_id, cancel_requested, objective_preview, created_at, updated_at");
+}
+const readPersistedTaskResultBody = createObjectColumnReader();
+function decodeResultColumn(v, taskId) {
+    return decodeNullableJsonColumn(v, readPersistedTaskResultBody, `task_run.result for run ${taskId}`);
+}
+function refusing(what, read) {
+    try {
+        return read();
+    }
+    catch (e) {
+        throw foldJsonColumn(e, (m) => new Error(`SqlRunStore: ${m} — refusing rather than ${what}`));
+    }
+}
+function usageResultBody(v) {
+    try {
+        return decodeJsonColumn(v, readJsonObjectColumn, "task_run.result (usage scan row)");
+    }
+    catch (e) {
+        if (!isJsonColumnBodyProblem(e))
+            throw e;
+        recordFailOpen("server.sql-json.task-run.usage-result-unreadable");
+        return undefined;
+    }
+}
+function decodeEventDataColumn(v, taskId, seq) {
+    return decodeNullableJsonColumn(v, readNonNullJsonValueColumn, `task_event.data for run ${taskId} seq ${seq}`);
+}
 export class SqlRunStore {
     db;
     constructor(db) {
@@ -178,7 +209,7 @@ export class SqlRunStore {
             sessionId: String(r.session_id),
             owner: r.owner ?? null,
             status: r.status,
-            result: parseJson(r.result),
+            result: refusing("serve a finished run as if it had produced nothing", () => decodeResultColumn(r.result, String(r.task_id))) ?? null,
             error: r.error ?? null,
             errorCode: r.error_code ?? null,
             jobId: r.job_id ?? null,
@@ -191,7 +222,7 @@ export class SqlRunStore {
         };
     }
     async getRun(taskId) {
-        const { rows } = await this.db.query(this.q(`SELECT ${RUN_ROW_COLS} FROM task_run WHERE task_id = ?`, `SELECT ${RUN_ROW_COLS} FROM task_run WHERE task_id = $1`), [taskId]);
+        const { rows } = await this.db.query(this.q(`SELECT ${runRowCols("tidb")} FROM task_run WHERE task_id = ?`, `SELECT ${runRowCols("pg")} FROM task_run WHERE task_id = $1`), [taskId]);
         return rows[0] ? this.rowToRun(rows[0]) : undefined;
     }
     async listRuns(opts) {
@@ -220,7 +251,7 @@ export class SqlRunStore {
                 where.push("(created_at < ? OR (created_at = ? AND task_id < ?))");
                 params.push(new Date(opts.cursor.createdAt), new Date(opts.cursor.createdAt), opts.cursor.taskId);
             }
-            const sql = `SELECT ${RUN_ROW_COLS} FROM task_run` +
+            const sql = `SELECT ${runRowCols("tidb")} FROM task_run` +
                 (where.length ? " WHERE " + where.join(" AND ") : "") +
                 " ORDER BY created_at DESC, task_id DESC LIMIT ?";
             params.push(opts.limit);
@@ -247,7 +278,7 @@ export class SqlRunStore {
             const t = p(opts.cursor.taskId);
             where.push(`(created_at < ${a} OR (created_at = ${b} AND task_id < ${t}))`);
         }
-        const sql = `SELECT ${RUN_ROW_COLS} FROM task_run` +
+        const sql = `SELECT ${runRowCols("pg")} FROM task_run` +
             (where.length ? " WHERE " + where.join(" AND ") : "") +
             ` ORDER BY created_at DESC, task_id DESC LIMIT ${p(opts.limit)}`;
         const { rows } = await this.db.query(sql, params);
@@ -359,7 +390,7 @@ export class SqlRunStore {
             where.push(this.q("owner = ?", "owner = $3"));
             params.push(opts.owner);
         }
-        const { rows } = await this.db.query(`SELECT owner, created_at, status, result FROM task_run WHERE ${where.join(" AND ")} ORDER BY created_at LIMIT ${limit + 1}`, params);
+        const { rows } = await this.db.query(`SELECT owner, created_at, status, ${jsonColumnText(this.db.dialect, "result")} FROM task_run WHERE ${where.join(" AND ")} ORDER BY created_at LIMIT ${limit + 1}`, params);
         const truncated = rows.length > limit;
         const page = truncated ? rows.slice(0, limit) : rows;
         return {
@@ -368,7 +399,7 @@ export class SqlRunStore {
                 owner: r.owner ?? null,
                 createdAtMs: new Date(r.created_at).getTime(),
                 status: String(r.status),
-                ...(r.result != null ? { stats: projectUsageStats(r.result) } : {}),
+                ...(r.result === null ? {} : { stats: projectUsageStats(usageResultBody(r.result)) }),
             })),
         };
     }
@@ -378,11 +409,11 @@ export class SqlRunStore {
         return m == null ? 0 : Number(m);
     }
     async getEvents(taskId, afterSeq) {
-        const { rows } = await this.db.query(this.q("SELECT seq, type, data, ts FROM task_event WHERE task_id = ? AND seq > ? ORDER BY seq ASC", "SELECT seq, type, data, ts FROM task_event WHERE task_id = $1 AND seq > $2 ORDER BY seq ASC"), [taskId, afterSeq]);
+        const { rows } = await this.db.query(this.q(`SELECT seq, type, ${jsonColumnText("tidb", "data")}, ts FROM task_event WHERE task_id = ? AND seq > ? ORDER BY seq ASC`, `SELECT seq, type, ${jsonColumnText("pg", "data")}, ts FROM task_event WHERE task_id = $1 AND seq > $2 ORDER BY seq ASC`), [taskId, afterSeq]);
         return rows.map((r) => ({
             seq: Number(r.seq),
             type: String(r.type),
-            data: parseJson(r.data),
+            data: refusing("replay it as an empty ledger frame", () => decodeEventDataColumn(r.data, taskId, Number(r.seq))) ?? null,
             ts: iso(r.ts),
         }));
     }

package/dist/plugins/session-policy-store-sql.d.ts

@@ -1,6 +1,7 @@
 import { type SessionPolicyStore, type SessionPermissionRules, type StoredSessionRules, type SessionRulesRecord, type PutRulesOptions } from "@sema-agent/core";
 import type { Pool as MySqlPool } from "mysql2/promise";
 import type { Pool as PgPool } from "pg";
+import { type JsonColumnShape } from "./sql-json-column.js";
 import { type SqlDriver } from "./sql-driver.js";
 /** `session_policy.policy_key` 的**唯一铸造点**(core 复合键的 sha256)。
  *
@@ -8,6 +9,29 @@ import { type SqlDriver } from "./sql-driver.js";
  *  逐行重算这把键(身份在 hash 的**原像**里,等值 UPDATE 够不着)。两处各写一遍 sha256 表达式的下场是
  *  某天有人在这里改了 key 公式而收编腿还在按旧式算 —— 迁完的行从此谁也读不到,且**静默**。 */
 export declare const policyKeyFor: (sessionId: string, principal: string | undefined) => string;
+/**
+ * 一行的 **`rules` 体**(已按文本取出的那一串)→ 收窄好的 `SessionPermissionRules`(C1)。读不出形 ⇒
+ * `SessionPolicyError("corrupt")`,与 rev / gen 两道拒同口径、同一个码。
+ *
+ * 形判据复用**现成的那一只**读者 `readSessionPermissionRules`(五桶 `string[]` 的单一属主;未知键照旧忽略,
+ * 与 core 的 `normalizeRules` 同口径),不在这里铸第二份键集。
+ *
+ * 🔴 **恰好解一次码,而这是由读腿的投影保证的**(codex 对抗复审两轮,两条读法各自实测被推翻后的终形):
+ *  · 「体是什么就直接判形」——**错**:MariaDB(本仓 README 声明支持的 MySQL 协议后端之一)的 `JSON` 是
+ *    `LONGTEXT` 的**别名**,驱动只对真 JSON 传输类型自动解码 ⇒ 那台机器上每一条**合法**规则都以文本到达,
+ *    会被判成 `corrupt`(三个读点全挂,一台好机器变砖);
+ *  · 「体是串就再解一次」——**也错**:`JSON`/`JSONB` 列上驱动已经解过一次,于是一行体为 `"{}"`(一个把
+ *    `JSON.stringify` 多调了一次的迁移脚本的典型产物)会被解成 `{}` 并当作**空规则**端出去 —— 与本道拒
+ *    要关的 `null` 洞逐字同形,只是换了个入口。
+ * 两条读法错在**同一个地方**:从值本身分不出「驱动解过了」还是「没解过」。⇒ 让这个歧义在**构造上**不存在:
+ * 三个读点都把这一列**按文本**投影(`CAST(rules AS CHAR)` / `::text`),于是到这里恒是一只串、恰好解一次。
+ * JSON 列里的字符串标量按文本取出来**带着引号**(真库实测两方言同形:`"\"{}\""`)⇒ 解一次得到一只串 ⇒ 判坏;
+ * 文本承载的列取出来就是它自己 ⇒ 解一次得到对象 ⇒ 好体。**一条规则,两种承载,零方言分叉,不依赖驱动行为。**
+ *
+ * 🔴 S-550:上面这一整段现在是**整仓**的口径,实现搬进唯一属主 `sql-json-column.ts`(投影 `jsonColumnText`
+ * + 恰好解一次 `decodeJsonColumn` + 折码 `foldJsonColumn`);本店只留「形判据是哪一只」与「坏体折成哪个码」。
+ */
+export declare function readSessionRulesBody(body: unknown): JsonColumnShape<SessionPermissionRules>;
 /** Dual-dialect durable SessionPolicyStore. See the file header for the dialect-delta ledger. */
 export declare class SqlSessionPolicyStore implements SessionPolicyStore {
     private readonly db;

package/dist/plugins/session-policy-store-sql.js

@@ -1,40 +1,39 @@
 import { createHash } from "node:crypto";
 import { loosenReasons, SessionPolicyError, normalizeRules, stripRev } from "@sema-agent/core";
 import { readSessionPermissionRules, describeSessionPermissionRulesProblem } from "../session-policy-wire.js";
+import { decodeJsonColumn, foldJsonColumn, jsonColumnText } from "./sql-json-column.js";
 import { pgHasUnstorable } from "./pg-safe-json.js";
 import { mysqlDriver, pgDriver } from "./sql-driver.js";
 import { isDeadlockError, isDupKeyError } from "./sql-errors.js";
 export const policyKeyFor = (sessionId, principal) => createHash("sha256").update(JSON.stringify([sessionId, principal ?? null])).digest("hex");
 const policyKey = policyKeyFor;
 const RETRY_LIMIT = 8;
+export function readSessionRulesBody(body) {
+    const read = readSessionPermissionRules(body);
+    return read.problem !== undefined ? { problem: describeSessionPermissionRulesProblem(read.problem) } : { value: read.rules };
+}
 function readRulesBody(text, where) {
-    let body;
     try {
-        body = JSON.parse(text);
-    }
-    catch {
-        throw new SessionPolicyError("corrupt", `session rules row ${where} carries a rules body that is not JSON (a torn or hand-edited write) — refusing rather than serve a row nobody can read as rules`);
+        return decodeJsonColumn(text, readSessionRulesBody, where);
     }
-    const read = readSessionPermissionRules(body);
-    if (read.problem !== undefined) {
-        throw new SessionPolicyError("corrupt", `session rules row ${where} carries a malformed rules body (${describeSessionPermissionRulesProblem(read.problem)}) — refusing rather than serve it as an EMPTY rule set, which would silently drop every tightening this session carries`);
+    catch (e) {
+        throw foldJsonColumn(e, (m) => new SessionPolicyError("corrupt", `${m} — an unreadable rules body served as an EMPTY rule set would silently drop every tightening this session carries`));
     }
-    return read.rules;
 }
 function rowToStored(r, where) {
     const rev = Number(r.rev);
     if (!Number.isFinite(rev) || !Number.isInteger(rev) || rev < 1) {
         throw new SessionPolicyError("corrupt", `session rules row ${where} carries rev ${String(r.rev)} — a stored row's rev is always ≥ 1 (the stamp is floor+1), and rev 0 is the live reader's synthetic empty seed; refusing rather than serve it as rules`);
     }
-    const gen = Number(r.gen ?? 0);
+    if (r.gen === undefined || r.gen === null) {
+        throw new Error(`session_policy row ${where} came back without a \`gen\` column — a read leg did not project it (the column is BIGINT NOT NULL on both dialects). ` +
+            "Refusing rather than judge this row's lineage as generation 0, which is a value nothing minted.");
+    }
+    const gen = Number(r.gen);
     if (!Number.isFinite(gen) || !Number.isInteger(gen) || gen < 0) {
         throw new SessionPolicyError("corrupt", `session rules row ${where} carries lineage gen ${String(r.gen)} — a generation is a whole number ≥ 0; refusing rather than let a reader judge lineage by a value nothing minted`);
     }
-    const raw = r.rules;
-    if (typeof raw !== "string") {
-        throw new Error(`session rules row ${where}: the read did not project the rules column as TEXT (got ${typeof raw}) — the SELECT and rowToStored have drifted apart`);
-    }
-    return { ...readRulesBody(raw, where), rev, gen };
+    return { ...readRulesBody(r.rules, `session_policy.rules ${where}`), rev, gen };
 }
 export class SqlSessionPolicyStore {
     db;
@@ -48,13 +47,13 @@ export class SqlSessionPolicyStore {
         return isDupKeyError(this.db.dialect, e);
     }
     async getRules(sessionId, principal) {
-        const { rows } = await this.db.query(this.q("SELECT CAST(rules AS CHAR) AS rules, rev, gen FROM session_policy WHERE policy_key = ?", "SELECT rules::text AS rules, rev, gen FROM session_policy WHERE policy_key = $1"), [policyKey(sessionId, principal)]);
+        const { rows } = await this.db.query(this.q(`SELECT ${jsonColumnText("tidb", "rules")}, rev, gen FROM session_policy WHERE policy_key = ?`, `SELECT ${jsonColumnText("pg", "rules")}, rev, gen FROM session_policy WHERE policy_key = $1`), [policyKey(sessionId, principal)]);
         if (!rows[0])
             return null;
         return rowToStored(rows[0], `for session ${JSON.stringify(sessionId)}`);
     }
     async listBySession(sessionId) {
-        const { rows } = await this.db.query(this.q("SELECT principal, CAST(rules AS CHAR) AS rules, rev, gen FROM session_policy WHERE session_id = ?", "SELECT principal, rules::text AS rules, rev, gen FROM session_policy WHERE session_id = $1"), [sessionId]);
+        const { rows } = await this.db.query(this.q(`SELECT principal, ${jsonColumnText("tidb", "rules")}, rev, gen FROM session_policy WHERE session_id = ?`, `SELECT principal, ${jsonColumnText("pg", "rules")}, rev, gen FROM session_policy WHERE session_id = $1`), [sessionId]);
         return rows.map((r) => ({
             principal: r.principal == null ? undefined : String(r.principal),
             rules: rowToStored(r, `for session ${JSON.stringify(sessionId)} (enumeration)`),
@@ -63,7 +62,7 @@ export class SqlSessionPolicyStore {
     async putRules(sessionId, principal, rules, opts) {
         const key = policyKey(sessionId, principal);
         return this.retrying(() => this.tx(async (conn) => {
-            const { rows } = await conn.query(this.q("SELECT CAST(rules AS CHAR) AS rules, rev, gen FROM session_policy WHERE policy_key = ? FOR UPDATE", "SELECT rules::text AS rules, rev, gen FROM session_policy WHERE policy_key = $1 FOR UPDATE"), [key]);
+            const { rows } = await conn.query(this.q(`SELECT ${jsonColumnText("tidb", "rules")}, rev, gen FROM session_policy WHERE policy_key = ? FOR UPDATE`, `SELECT ${jsonColumnText("pg", "rules")}, rev, gen FROM session_policy WHERE policy_key = $1 FOR UPDATE`), [key]);
             const prior = rows[0] ? rowToStored(rows[0], `for session ${JSON.stringify(sessionId)} (pre-write snapshot)`) : undefined;
             const priorRev = prior?.rev ?? 0;
             if (opts?.expectedRev !== undefined && priorRev !== opts.expectedRev) {