@sema-agent/server 1.239.0 → 1.241.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/config.d.ts +1 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +1 -0
- package/dist/config.js.map +1 -1
- package/dist/fleet/fleet-bus.d.ts +3 -0
- package/dist/fleet/fleet-bus.d.ts.map +1 -1
- package/dist/fleet/fleet-bus.js +27 -2
- package/dist/fleet/fleet-bus.js.map +1 -1
- package/dist/http/server.d.ts.map +1 -1
- package/dist/http/server.js +45 -23
- package/dist/http/server.js.map +1 -1
- package/dist/main.js +1 -0
- package/dist/main.js.map +1 -1
- package/dist/plugins/memory-engine-pg.d.ts.map +1 -1
- package/dist/plugins/memory-engine-pg.js +22 -10
- package/dist/plugins/memory-engine-pg.js.map +1 -1
- package/dist/plugins/memory-sync-store-pg.d.ts.map +1 -1
- package/dist/plugins/memory-sync-store-pg.js +4 -3
- package/dist/plugins/memory-sync-store-pg.js.map +1 -1
- package/dist/plugins/pg-approval-store.d.ts.map +1 -1
- package/dist/plugins/pg-approval-store.js +2 -1
- package/dist/plugins/pg-approval-store.js.map +1 -1
- package/dist/plugins/pg-checkpoint-store.d.ts.map +1 -1
- package/dist/plugins/pg-checkpoint-store.js +7 -6
- package/dist/plugins/pg-checkpoint-store.js.map +1 -1
- package/dist/plugins/pg-image-bake.d.ts +1 -1
- package/dist/plugins/pg-image-bake.d.ts.map +1 -1
- package/dist/plugins/pg-image-bake.js +17 -15
- package/dist/plugins/pg-image-bake.js.map +1 -1
- package/dist/plugins/pg-image-index.d.ts.map +1 -1
- package/dist/plugins/pg-image-index.js +18 -9
- package/dist/plugins/pg-image-index.js.map +1 -1
- package/dist/plugins/pg-outcome-ledger.d.ts.map +1 -1
- package/dist/plugins/pg-outcome-ledger.js +5 -4
- package/dist/plugins/pg-outcome-ledger.js.map +1 -1
- package/dist/plugins/pg-run-store.d.ts.map +1 -1
- package/dist/plugins/pg-run-store.js +6 -5
- package/dist/plugins/pg-run-store.js.map +1 -1
- package/dist/plugins/pg-safe-json.d.ts +9 -0
- package/dist/plugins/pg-safe-json.d.ts.map +1 -0
- package/dist/plugins/pg-safe-json.js +90 -0
- package/dist/plugins/pg-safe-json.js.map +1 -0
- package/dist/plugins/pg-session-policy-store.d.ts.map +1 -1
- package/dist/plugins/pg-session-policy-store.js +4 -0
- package/dist/plugins/pg-session-policy-store.js.map +1 -1
- package/dist/plugins/pg-session-storage.d.ts.map +1 -1
- package/dist/plugins/pg-session-storage.js +5 -4
- package/dist/plugins/pg-session-storage.js.map +1 -1
- package/dist/plugins/pg-tool-result-store.d.ts.map +1 -1
- package/dist/plugins/pg-tool-result-store.js +2 -1
- package/dist/plugins/pg-tool-result-store.js.map +1 -1
- package/dist/plugins/pg-workflow-journal-store.d.ts.map +1 -1
- package/dist/plugins/pg-workflow-journal-store.js.map +1 -1
- package/dist/plugins/remote-env-e2b.d.ts.map +1 -1
- package/dist/plugins/remote-env-e2b.js.map +1 -1
- package/dist/plugins/tidb-image-bake.d.ts +1 -1
- package/dist/plugins/tidb-image-bake.d.ts.map +1 -1
- package/dist/plugins/tidb-image-bake.js +3 -2
- package/dist/plugins/tidb-image-bake.js.map +1 -1
- package/dist/plugins/tidb-workflow-journal-store.d.ts.map +1 -1
- package/dist/plugins/tidb-workflow-journal-store.js.map +1 -1
- package/dist/tool-approval.d.ts +1 -0
- package/dist/tool-approval.d.ts.map +1 -1
- package/dist/tool-approval.js +13 -8
- package/dist/tool-approval.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
|
+
import { pgSafeJsonStringify, pgSanitizeText, pgHasUnstorable, PgUnstorableError } from "./pg-safe-json.js";
|
|
2
3
|
import {} from "./tidb-image-index.js";
|
|
3
4
|
export const PG_IMAGE_INDEX_SCHEMA = [
|
|
4
5
|
`CREATE TABLE IF NOT EXISTS sandbox_image_index (
|
|
@@ -111,23 +112,23 @@ const UPSERT_VALUES = "($1,$2,$3::jsonb,$4,$5,$6,$7::jsonb,$8::jsonb,$9::jsonb,$
|
|
|
111
112
|
function upsertParams(e, id, now) {
|
|
112
113
|
return [
|
|
113
114
|
id,
|
|
114
|
-
e.profile,
|
|
115
|
-
|
|
115
|
+
pgSanitizeText(e.profile),
|
|
116
|
+
pgSafeJsonStringify(e.bands ?? []),
|
|
116
117
|
e.repo,
|
|
117
|
-
e.tag,
|
|
118
|
+
pgSanitizeText(e.tag),
|
|
118
119
|
e.digest,
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
120
|
+
pgSafeJsonStringify(e.toolchainVersions ?? {}),
|
|
121
|
+
pgSafeJsonStringify(e.capabilities ?? {}),
|
|
122
|
+
pgSafeJsonStringify(e.podContract ?? {}),
|
|
122
123
|
e.sizeBytes,
|
|
123
124
|
e.status,
|
|
124
125
|
e.visibility,
|
|
125
126
|
e.tenantId ?? null,
|
|
126
127
|
e.manifestSha ?? null,
|
|
127
|
-
e.recipeGitSha
|
|
128
|
-
e.generatorVersion
|
|
128
|
+
e.recipeGitSha == null ? null : pgSanitizeText(e.recipeGitSha),
|
|
129
|
+
e.generatorVersion == null ? null : pgSanitizeText(e.generatorVersion),
|
|
129
130
|
e.buildDate ? new Date(e.buildDate) : null,
|
|
130
|
-
e.supersedes
|
|
131
|
+
e.supersedes == null ? null : pgSanitizeText(e.supersedes),
|
|
131
132
|
e.signed ? true : false,
|
|
132
133
|
now,
|
|
133
134
|
now,
|
|
@@ -142,6 +143,10 @@ export class PgImageIndex {
|
|
|
142
143
|
return createHash("sha256").update(`${repo}@${digest}`).digest("hex").slice(0, 64);
|
|
143
144
|
}
|
|
144
145
|
async upsert(e) {
|
|
146
|
+
if (pgHasUnstorable(e.repo))
|
|
147
|
+
throw new PgUnstorableError("image repo (identity)");
|
|
148
|
+
if (e.tenantId != null && pgHasUnstorable(e.tenantId))
|
|
149
|
+
throw new PgUnstorableError("image tenantId (identity)");
|
|
145
150
|
const id = PgImageIndex.idFor(e.repo, e.digest);
|
|
146
151
|
const now = new Date();
|
|
147
152
|
await this.pool.query(`INSERT INTO sandbox_image_index ${UPSERT_COLS}
|
|
@@ -157,6 +162,10 @@ export class PgImageIndex {
|
|
|
157
162
|
return id;
|
|
158
163
|
}
|
|
159
164
|
async registerBuilding(e) {
|
|
165
|
+
if (pgHasUnstorable(e.repo))
|
|
166
|
+
throw new PgUnstorableError("image repo (identity)");
|
|
167
|
+
if (e.tenantId != null && pgHasUnstorable(e.tenantId))
|
|
168
|
+
throw new PgUnstorableError("image tenantId (identity)");
|
|
160
169
|
const id = PgImageIndex.idFor(e.repo, e.digest);
|
|
161
170
|
const now = new Date();
|
|
162
171
|
await this.pool.query(`INSERT INTO sandbox_image_index ${UPSERT_COLS}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pg-image-index.js","sourceRoot":"","sources":["../../src/plugins/pg-image-index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pg-image-index.js","sourceRoot":"","sources":["../../src/plugins/pg-image-index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pg-outcome-ledger.d.ts","sourceRoot":"","sources":["../../src/plugins/pg-outcome-ledger.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAC3C,OAAO,EAGL,KAAK,WAAW,EAChB,KAAK,SAAS,EACf,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EAAE,WAAW,IAAI,eAAe,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"pg-outcome-ledger.d.ts","sourceRoot":"","sources":["../../src/plugins/pg-outcome-ledger.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAC3C,OAAO,EAGL,KAAK,WAAW,EAChB,KAAK,SAAS,EACf,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EAAE,WAAW,IAAI,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAQvE,eAAO,MAAM,wBAAwB,EAAE,MAAM,EA+B5C,CAAC;AAGF,wBAAsB,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAEzE;AAED,qBAAa,eAAe;IACd,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,IAAI;IAGjC,MAAM,CAAC,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAsCvC,UAAU,CAAC,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ7C,OAAO,CAAC,IAAI,GAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,OAAO,CAAA;KAAO,GAAG,OAAO,CAAC,KAAK,CAAC;QAC5F,aAAa,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,gBAAgB,EAAE,MAAM,CAAC;KAC7F,CAAC,CAAC;CAyBJ;AAGD,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
2
|
import { taskSignature, deriveOutcome, } from "./tidb-outcome-ledger.js";
|
|
3
3
|
import { coreOutcomeToLedgerRow } from "./tidb-outcome-ledger.js";
|
|
4
|
+
import { pgSafeJsonStringify } from "./pg-safe-json.js";
|
|
4
5
|
export const PG_OUTCOME_LEDGER_SCHEMA = [
|
|
5
6
|
`CREATE TABLE IF NOT EXISTS outcome_ledger (
|
|
6
7
|
id VARCHAR(64) NOT NULL,
|
|
@@ -61,13 +62,13 @@ export class PgOutcomeLedger {
|
|
|
61
62
|
m.assembleExit ?? null,
|
|
62
63
|
m.lintExit ?? null,
|
|
63
64
|
m.mergeOk == null ? null : m.mergeOk ? 1 : 0,
|
|
64
|
-
m.replanTriggers ?
|
|
65
|
+
m.replanTriggers ? pgSafeJsonStringify(m.replanTriggers) : null,
|
|
65
66
|
m.costMicroUsd ?? null,
|
|
66
67
|
m.turns ?? null,
|
|
67
68
|
deriveOutcome(m, runStatus),
|
|
68
|
-
o.llmAssisted ?
|
|
69
|
-
|
|
70
|
-
o.core != null ?
|
|
69
|
+
o.llmAssisted ? pgSafeJsonStringify(o.llmAssisted) : null,
|
|
70
|
+
pgSafeJsonStringify(o.signatureInputs),
|
|
71
|
+
o.core != null ? pgSafeJsonStringify(o.core) : null,
|
|
71
72
|
new Date(),
|
|
72
73
|
]);
|
|
73
74
|
return id;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pg-outcome-ledger.js","sourceRoot":"","sources":["../../src/plugins/pg-outcome-ledger.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EACL,aAAa,EACb,aAAa,GAGd,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"pg-outcome-ledger.js","sourceRoot":"","sources":["../../src/plugins/pg-outcome-ledger.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EACL,aAAa,EACb,aAAa,GAGd,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAOxD,MAAM,CAAC,MAAM,wBAAwB,GAAa;IAChD;;;;;;;;;;;;;;;;;;;;;;KAsBG;IAIH,wEAAwE;IACxE,+GAA+G;IAC/G,mFAAmF;IACnF,sFAAsF;CACvF,CAAC;AAGF,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAuB;IACxD,KAAK,MAAM,IAAI,IAAI,wBAAwB;QAAE,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,OAAO,eAAe;IACG;IAA7B,YAA6B,IAAU;QAAV,SAAI,GAAJ,IAAI,CAAM;IAAG,CAAC;IAG3C,KAAK,CAAC,MAAM,CAAC,CAAc;QACzB,MAAM,EAAE,GAAG,UAAU,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACvD,MAAM,GAAG,GAAG,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;QAC7C,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC;QACvB,MAAM,SAAS,GAAG,CAAC,CAAC,SAAS,IAAI,kBAAkB,CAAC;QACpD,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CACnB;;;;mHAI6G,EAC7G;YACE,EAAE;YACF,GAAG;YACH,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,MAAM,IAAI,IAAI;YAChB,SAAS;YACT,CAAC,CAAC,KAAK,IAAI,IAAI;YACf,CAAC,CAAC,WAAW,IAAI,IAAI;YACrB,CAAC,CAAC,YAAY,IAAI,IAAI;YACtB,CAAC,CAAC,WAAW,IAAI,IAAI;YACrB,CAAC,CAAC,YAAY,IAAI,IAAI;YACtB,CAAC,CAAC,QAAQ,IAAI,IAAI;YAClB,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5C,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI;YAC/D,CAAC,CAAC,YAAY,IAAI,IAAI;YACtB,CAAC,CAAC,KAAK,IAAI,IAAI;YACf,aAAa,CAAC,CAAC,EAAE,SAAS,CAAC;YAC3B,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI;YACzD,mBAAmB,CAAC,CAAC,CAAC,eAAe,CAAC;YACtC,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;YACnD,IAAI,IAAI,EAAE;SACX,CACF,CAAC;QACF,OAAO,EAAE,CAAC;IACZ,CAAC;IAGD,KAAK,CAAC,UAAU,CAAC,CAAkB;QACjC,MAAM,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/C,CAAC;IAMD,KAAK,CAAC,OAAO,CAAC,OAA6D,EAAE;QAG3E,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAc,EAAE,CAAC;QAC7B,IAAI,CAAC,IAAI,CAAC,cAAc;YAAE,OAAO,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QAC1E,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAChC,OAAO,CAAC,IAAI,CAAC,qBAAqB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QACrD,CAAC;QACD,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrE,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAC/B;;+BAEyB,KAAK;;uCAEG,EACjC,MAAM,CACP,CAAC;QACF,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC1B,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC;YACvC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;YACtB,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACd,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7B,gBAAgB,EAAE,MAAM,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC;SAC3C,CAAC,CAAC,CAAC;IACN,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pg-run-store.d.ts","sourceRoot":"","sources":["../../src/plugins/pg-run-store.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAuC,KAAK,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAE3F,OAAO,KAAK,EAAE,IAAI,EAAc,MAAM,IAAI,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"pg-run-store.d.ts","sourceRoot":"","sources":["../../src/plugins/pg-run-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { projectUsageStats, USAGE_SCAN_LIMIT } from "../usage-analytics.js";
|
|
2
2
|
import { escapeLike } from "./tidb-tool-result-store.js";
|
|
3
|
+
import { pgSafeJsonStringify, pgSanitizeText } from "./pg-safe-json.js";
|
|
3
4
|
function parseJson(v) {
|
|
4
5
|
if (v == null)
|
|
5
6
|
return null;
|
|
@@ -60,7 +61,7 @@ export class PgRunStore {
|
|
|
60
61
|
throw err;
|
|
61
62
|
}
|
|
62
63
|
await c.query("INSERT INTO task_run (task_id, session_id, owner, status, instance_id, job_id, source, objective_preview, created_at, updated_at) " +
|
|
63
|
-
"VALUES ($1,$2,$3,'running',$4,$5,$6,$7,$8,$9)", [taskId, sessionId, owner, instanceId, meta.jobId ?? null, meta.source ?? null, meta.objectivePreview
|
|
64
|
+
"VALUES ($1,$2,$3,'running',$4,$5,$6,$7,$8,$9)", [taskId, sessionId, owner, instanceId, meta.jobId ?? null, meta.source ?? null, meta.objectivePreview == null ? null : pgSanitizeText(meta.objectivePreview), now, now]);
|
|
64
65
|
await c.query("COMMIT");
|
|
65
66
|
return { ok: true };
|
|
66
67
|
}
|
|
@@ -100,7 +101,7 @@ export class PgRunStore {
|
|
|
100
101
|
taskId,
|
|
101
102
|
seq,
|
|
102
103
|
type,
|
|
103
|
-
data == null ? null :
|
|
104
|
+
data == null ? null : pgSafeJsonStringify(data),
|
|
104
105
|
new Date(),
|
|
105
106
|
]);
|
|
106
107
|
}
|
|
@@ -114,9 +115,9 @@ export class PgRunStore {
|
|
|
114
115
|
await this.tx(async (c) => {
|
|
115
116
|
await c.query("UPDATE task_run SET status = $1, result = $2::jsonb, error = $3, error_code = $4, updated_at = $5 WHERE task_id = $6 AND status IN ('running','suspended','needs_review')", [
|
|
116
117
|
status,
|
|
117
|
-
result == null ? null :
|
|
118
|
-
error,
|
|
119
|
-
errorCode,
|
|
118
|
+
result == null ? null : pgSafeJsonStringify(result),
|
|
119
|
+
error == null ? null : pgSanitizeText(error),
|
|
120
|
+
errorCode == null ? null : pgSanitizeText(errorCode),
|
|
120
121
|
new Date(),
|
|
121
122
|
taskId,
|
|
122
123
|
]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pg-run-store.js","sourceRoot":"","sources":["../../src/plugins/pg-run-store.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"pg-run-store.js","sourceRoot":"","sources":["../../src/plugins/pg-run-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export declare function pgSanitizeText(s: string): string;
|
|
2
|
+
export declare function pgSafeJsonStringify(value: unknown): string;
|
|
3
|
+
export declare function pgLosslessJsonStringify(value: unknown): string;
|
|
4
|
+
export declare function pgHasUnstorable(v: unknown): boolean;
|
|
5
|
+
export declare class PgUnstorableError extends Error {
|
|
6
|
+
constructor(what: string);
|
|
7
|
+
}
|
|
8
|
+
export declare function pgProtocolJsonStringify(value: unknown, what: string): string;
|
|
9
|
+
//# sourceMappingURL=pg-safe-json.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pg-safe-json.d.ts","sourceRoot":"","sources":["../../src/plugins/pg-safe-json.ts"],"names":[],"mappings":"AAmBA,wBAAgB,cAAc,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAEhD;AA4BD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAO1D;AAeD,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAiB9D;AAKD,wBAAgB,eAAe,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CASnD;AAOD,qBAAa,iBAAkB,SAAQ,KAAK;gBAC9B,IAAI,EAAE,MAAM;CAOzB;AAGD,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAK5E"}
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
const NUL_OR_LONE_SURROGATE = /\u0000|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g;
|
|
2
|
+
export function pgSanitizeText(s) {
|
|
3
|
+
return s.replace(NUL_OR_LONE_SURROGATE, "�");
|
|
4
|
+
}
|
|
5
|
+
function sanitizeDeep(v, state) {
|
|
6
|
+
if (typeof v === "string") {
|
|
7
|
+
const s = pgSanitizeText(v);
|
|
8
|
+
if (s !== v)
|
|
9
|
+
state.changed = true;
|
|
10
|
+
return s;
|
|
11
|
+
}
|
|
12
|
+
if (Array.isArray(v))
|
|
13
|
+
return v.map((x) => sanitizeDeep(x, state));
|
|
14
|
+
if (v !== null && typeof v === "object") {
|
|
15
|
+
const out = Object.create(null);
|
|
16
|
+
for (const [k, val] of Object.entries(v)) {
|
|
17
|
+
let key = pgSanitizeText(k);
|
|
18
|
+
if (key !== k)
|
|
19
|
+
state.changed = true;
|
|
20
|
+
while (Object.prototype.hasOwnProperty.call(out, key)) {
|
|
21
|
+
key += "�";
|
|
22
|
+
state.changed = true;
|
|
23
|
+
}
|
|
24
|
+
out[key] = sanitizeDeep(val, state);
|
|
25
|
+
}
|
|
26
|
+
return out;
|
|
27
|
+
}
|
|
28
|
+
return v;
|
|
29
|
+
}
|
|
30
|
+
export function pgSafeJsonStringify(value) {
|
|
31
|
+
const raw = JSON.stringify(value);
|
|
32
|
+
if (raw === undefined)
|
|
33
|
+
return raw;
|
|
34
|
+
const plain = JSON.parse(raw);
|
|
35
|
+
const state = { changed: false };
|
|
36
|
+
const clean = sanitizeDeep(plain, state);
|
|
37
|
+
return state.changed ? JSON.stringify(clean) : raw;
|
|
38
|
+
}
|
|
39
|
+
const ENVELOPE_KEY = "__pgSafe";
|
|
40
|
+
const ENVELOPE_VERSION = "b64.v1";
|
|
41
|
+
function isEnvelope(o) {
|
|
42
|
+
return Object.keys(o).length === 2 && o[ENVELOPE_KEY] === ENVELOPE_VERSION && typeof o.d === "string";
|
|
43
|
+
}
|
|
44
|
+
export function pgLosslessJsonStringify(value) {
|
|
45
|
+
const raw = JSON.stringify(value);
|
|
46
|
+
if (raw === undefined)
|
|
47
|
+
return raw;
|
|
48
|
+
const plain = JSON.parse(raw);
|
|
49
|
+
const state = { changed: false };
|
|
50
|
+
sanitizeDeep(plain, state);
|
|
51
|
+
if (!state.changed) {
|
|
52
|
+
if (plain !== null && typeof plain === "object" && !Array.isArray(plain)) {
|
|
53
|
+
const rec = plain;
|
|
54
|
+
if (isEnvelope(rec) || (Object.keys(rec).length === 2 && rec[ENVELOPE_KEY] === "esc.v1" && typeof rec.d === "string")) {
|
|
55
|
+
return JSON.stringify({ [ENVELOPE_KEY]: "esc.v1", d: raw });
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
return raw;
|
|
59
|
+
}
|
|
60
|
+
return JSON.stringify({ [ENVELOPE_KEY]: ENVELOPE_VERSION, d: Buffer.from(raw, "utf8").toString("base64") });
|
|
61
|
+
}
|
|
62
|
+
export function pgHasUnstorable(v) {
|
|
63
|
+
if (typeof v === "string")
|
|
64
|
+
return NUL_OR_LONE_SURROGATE.test(v) ? (NUL_OR_LONE_SURROGATE.lastIndex = 0, true) : false;
|
|
65
|
+
if (Array.isArray(v))
|
|
66
|
+
return v.some((x) => pgHasUnstorable(x));
|
|
67
|
+
if (v !== null && typeof v === "object") {
|
|
68
|
+
for (const [k, val] of Object.entries(v)) {
|
|
69
|
+
if (pgHasUnstorable(k) || pgHasUnstorable(val))
|
|
70
|
+
return true;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
return false;
|
|
74
|
+
}
|
|
75
|
+
export class PgUnstorableError extends Error {
|
|
76
|
+
constructor(what) {
|
|
77
|
+
super(`${what} contains bytes PostgreSQL cannot store (NUL / lone surrogate). ` +
|
|
78
|
+
`Strip them at the source — the store never rewrites protocol data (authorization, approvals, checkpoints).`);
|
|
79
|
+
this.name = "PgUnstorableError";
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
export function pgProtocolJsonStringify(value, what) {
|
|
83
|
+
const raw = JSON.stringify(value);
|
|
84
|
+
if (raw === undefined)
|
|
85
|
+
return raw;
|
|
86
|
+
if (pgHasUnstorable(JSON.parse(raw)))
|
|
87
|
+
throw new PgUnstorableError(what);
|
|
88
|
+
return raw;
|
|
89
|
+
}
|
|
90
|
+
//# sourceMappingURL=pg-safe-json.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pg-safe-json.js","sourceRoot":"","sources":["../../src/plugins/pg-safe-json.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pg-session-policy-store.d.ts","sourceRoot":"","sources":["../../src/plugins/pg-session-policy-store.ts"],"names":[],"mappings":"AASA,OAAO,EAA+D,KAAK,kBAAkB,EAAE,KAAK,sBAAsB,EAAE,KAAK,kBAAkB,EAAE,KAAK,kBAAkB,EAAE,KAAK,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAC7N,OAAO,KAAK,EAAE,IAAI,EAAc,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"pg-session-policy-store.d.ts","sourceRoot":"","sources":["../../src/plugins/pg-session-policy-store.ts"],"names":[],"mappings":"AASA,OAAO,EAA+D,KAAK,kBAAkB,EAAE,KAAK,sBAAsB,EAAE,KAAK,kBAAkB,EAAE,KAAK,kBAAkB,EAAE,KAAK,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAC7N,OAAO,KAAK,EAAE,IAAI,EAAc,MAAM,IAAI,CAAC;AAQ3C,qBAAa,oBAAqB,YAAW,kBAAkB;IACjD,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,IAAI;IAEjC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAWnF,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAW/D,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,sBAAsB,EAAE,IAAI,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAmD9I,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAK3C,EAAE;CAkBjB"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
2
|
import { loosenReasons, SessionPolicyError, normalizeRules, stripRev } from "@sema-agent/core";
|
|
3
|
+
import { pgHasUnstorable } from "./pg-safe-json.js";
|
|
3
4
|
const policyKey = (sessionId, principal) => createHash("sha256").update(JSON.stringify([sessionId, principal ?? null])).digest("hex");
|
|
4
5
|
const parseRules = (v) => (typeof v === "string" ? JSON.parse(v) : v);
|
|
5
6
|
const isDupKey = (e) => e?.code === "23505";
|
|
@@ -40,6 +41,9 @@ export class PgSessionPolicyStore {
|
|
|
40
41
|
}
|
|
41
42
|
}
|
|
42
43
|
const nextRev = priorRev + 1;
|
|
44
|
+
if (pgHasUnstorable(clean)) {
|
|
45
|
+
throw new SessionPolicyError("loosen_forbidden", "rules contain unstorable bytes (NUL / lone surrogate) — refused; strip them at the source (authorization rules are never rewritten by the store)");
|
|
46
|
+
}
|
|
43
47
|
const json = JSON.stringify(clean);
|
|
44
48
|
const now = new Date();
|
|
45
49
|
if (prior) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pg-session-policy-store.js","sourceRoot":"","sources":["../../src/plugins/pg-session-policy-store.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,cAAc,EAAE,QAAQ,EAAgI,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"pg-session-policy-store.js","sourceRoot":"","sources":["../../src/plugins/pg-session-policy-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pg-session-storage.d.ts","sourceRoot":"","sources":["../../src/plugins/pg-session-storage.ts"],"names":[],"mappings":"AAoBA,OAAO,EACL,kBAAkB,EAOlB,KAAK,qBAAqB,EAC1B,KAAK,eAAe,EACpB,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EACzB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAC3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"pg-session-storage.d.ts","sourceRoot":"","sources":["../../src/plugins/pg-session-storage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { emitLeafAdvance } from "../session-leaf-bus.js";
|
|
2
2
|
import { BaseSessionStorage, Session, SessionError, uuidv7, validateEntriesForImport, leafIdAfterEntry, normalizePromptEpoch, } from "@sema-agent/core";
|
|
3
3
|
import { escapeLike } from "./tidb-tool-result-store.js";
|
|
4
|
+
import { pgSafeJsonStringify } from "./pg-safe-json.js";
|
|
4
5
|
import { classifySyncRelationshipByIds, SyncConflictError, stagingIdFor, STAGING_ID_MARKER, } from "../session-sync.js";
|
|
5
6
|
const STAGING_GC_GRACE_MS = 3_600_000;
|
|
6
7
|
function isDupKey(err) {
|
|
@@ -130,7 +131,7 @@ export class PgSessionStorage extends BaseSessionStorage {
|
|
|
130
131
|
const seqRes = await conn.query("SELECT leaf_seq, owner FROM session_meta WHERE session_id = $1", [this.sessionId]);
|
|
131
132
|
const seq = Number(seqRes.rows[0].leaf_seq);
|
|
132
133
|
const commitOwner = seqRes.rows[0].owner ?? null;
|
|
133
|
-
await conn.query("INSERT INTO session_event (session_id, seq, entry_id, parent_id, type, payload, ts) VALUES ($1,$2,$3,$4,$5,$6::jsonb,$7)", [this.sessionId, seq, entry.id, entry.parentId ?? null, entry.type,
|
|
134
|
+
await conn.query("INSERT INTO session_event (session_id, seq, entry_id, parent_id, type, payload, ts) VALUES ($1,$2,$3,$4,$5,$6::jsonb,$7)", [this.sessionId, seq, entry.id, entry.parentId ?? null, entry.type, pgSafeJsonStringify(entry), new Date(entry.timestamp)]);
|
|
134
135
|
await conn.query("COMMIT");
|
|
135
136
|
emitLeafAdvance(this.sessionId, newLeaf, commitOwner, seq);
|
|
136
137
|
}
|
|
@@ -276,7 +277,7 @@ export class PgSessionStore {
|
|
|
276
277
|
await conn.query("BEGIN");
|
|
277
278
|
for (let seq = 0; seq < rows.length; seq++) {
|
|
278
279
|
const r = rows[seq];
|
|
279
|
-
const payload = typeof r.payload === "string" ? r.payload :
|
|
280
|
+
const payload = typeof r.payload === "string" ? r.payload : pgSafeJsonStringify(r.payload);
|
|
280
281
|
await conn.query("INSERT INTO session_event (session_id, seq, entry_id, parent_id, type, payload, ts) VALUES ($1,$2,$3,$4,$5,$6::jsonb,$7)", [newId, seq, r.entry_id, r.parent_id ?? null, r.type, payload, r.ts]);
|
|
281
282
|
}
|
|
282
283
|
await conn.query("INSERT INTO session_meta (session_id, owner, created_at, updated_at, leaf_id, leaf_seq) VALUES ($1,$2,$3,$4,$5,$6)", [newId, owner, now, now, leafId, rows.length]);
|
|
@@ -381,7 +382,7 @@ export class PgSessionStore {
|
|
|
381
382
|
const now = new Date();
|
|
382
383
|
for (let seq = 0; seq < validated.length; seq++) {
|
|
383
384
|
const e = validated[seq];
|
|
384
|
-
await conn.query("INSERT INTO session_event (session_id, seq, entry_id, parent_id, type, payload, ts) VALUES ($1,$2,$3,$4,$5,$6::jsonb,$7)", [sessionId, seq, e.id, e.parentId ?? null, e.type,
|
|
385
|
+
await conn.query("INSERT INTO session_event (session_id, seq, entry_id, parent_id, type, payload, ts) VALUES ($1,$2,$3,$4,$5,$6::jsonb,$7)", [sessionId, seq, e.id, e.parentId ?? null, e.type, pgSafeJsonStringify(e), new Date(e.timestamp)]);
|
|
385
386
|
}
|
|
386
387
|
await conn.query("INSERT INTO session_meta (session_id, owner, created_at, updated_at, leaf_id, leaf_seq) VALUES ($1,$2,$3,$4,$5,$6)", [sessionId, owner, now, now, leafId, validated.length]);
|
|
387
388
|
}
|
|
@@ -452,7 +453,7 @@ class PgStagingHandle {
|
|
|
452
453
|
continue;
|
|
453
454
|
const b = params.length;
|
|
454
455
|
tuples.push(`($${b + 1},$${b + 2},$${b + 3},$${b + 4},$${b + 5},$${b + 6}::jsonb,$${b + 7})`);
|
|
455
|
-
params.push(this.stagingId, this.nextSeq, e.id, e.parentId ?? null, e.type,
|
|
456
|
+
params.push(this.stagingId, this.nextSeq, e.id, e.parentId ?? null, e.type, pgSafeJsonStringify(e), new Date());
|
|
456
457
|
this.seen.add(e.id);
|
|
457
458
|
this.nextSeq++;
|
|
458
459
|
}
|