@itphx/synth-storage-postgres 0.13.4 → 0.13.10
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/index.d.ts +2 -0
- package/dist/index.js +3 -0
- package/dist/migrations/026-instance-skills.d.ts +1 -1
- package/dist/migrations/026-instance-skills.js +1 -1
- package/dist/migrations/031-ssh-key-policy.d.ts +13 -0
- package/dist/migrations/031-ssh-key-policy.js +25 -0
- package/dist/migrations/032-mcp-remote-mode.d.ts +14 -0
- package/dist/migrations/032-mcp-remote-mode.js +18 -0
- package/dist/migrations/033-session-source-id.d.ts +16 -0
- package/dist/migrations/033-session-source-id.js +21 -0
- package/dist/migrations/034-pending-approvals.d.ts +18 -0
- package/dist/migrations/034-pending-approvals.js +35 -0
- package/dist/migrations/035-project-access.d.ts +16 -0
- package/dist/migrations/035-project-access.js +22 -0
- package/dist/migrations/036-message-mentions.d.ts +8 -0
- package/dist/migrations/036-message-mentions.js +12 -0
- package/dist/migrations/037-timers.d.ts +19 -0
- package/dist/migrations/037-timers.js +60 -0
- package/dist/migrations/038-schedule-project-id.d.ts +18 -0
- package/dist/migrations/038-schedule-project-id.js +38 -0
- package/dist/migrations/index.js +16 -0
- package/dist/ports/content.js +80 -9
- package/dist/ports/context-files.d.ts +6 -0
- package/dist/ports/context-files.js +13 -0
- package/dist/ports/events-scheduler.js +19 -4
- package/dist/ports/pending-approvals.d.ts +32 -0
- package/dist/ports/pending-approvals.js +108 -0
- package/dist/ports/principals-defaults.js +10 -0
- package/dist/ports/principals-projects.d.ts +7 -1
- package/dist/ports/principals-projects.js +66 -11
- package/dist/ports/principals-settings.js +80 -0
- package/dist/ports/sessions-mapping.d.ts +36 -5
- package/dist/ports/sessions-mapping.js +32 -4
- package/dist/ports/sessions.d.ts +55 -8
- package/dist/ports/sessions.js +285 -37
- package/dist/ports/skills.d.ts +2 -2
- package/dist/ports/skills.js +2 -2
- package/dist/ports/timers.d.ts +54 -0
- package/dist/ports/timers.js +247 -0
- package/dist/ports/worktrees.d.ts +3 -3
- package/dist/ports/worktrees.js +3 -3
- package/dist/storage-context.d.ts +4 -2
- package/dist/storage-context.js +17 -3
- package/package.json +5 -5
package/dist/ports/content.js
CHANGED
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
*/
|
|
36
36
|
import { join, normalize } from 'node:path';
|
|
37
37
|
import { createHash, randomBytes } from 'node:crypto';
|
|
38
|
-
import { GlobalRole, MCP_REGISTRY_SCHEMA_VERSION, SKILL_NAME_MAX, SKILL_NAME_REGEX, generateId, nowISO, } from '@itphx/synth-shared';
|
|
38
|
+
import { GlobalRole, MCP_REGISTRY_SCHEMA_VERSION, SKILL_NAME_MAX, SKILL_NAME_REGEX, SSH_KEY_USAGES, generateId, normalizeSshKeyAllowHosts, normalizeSshKeyAllowPorts, normalizeSshKeyUsages, nowISO, validateSshKeyPolicy, } from '@itphx/synth-shared';
|
|
39
39
|
import { jsonbParam } from '../json-param.js';
|
|
40
40
|
import { PostgresUniqueViolationError } from '../errors.js';
|
|
41
41
|
import { readSchemaVersion } from '../migrate.js';
|
|
@@ -464,12 +464,32 @@ class PostgresServiceKeyRepository {
|
|
|
464
464
|
function bufferToToken(value) {
|
|
465
465
|
return Buffer.isBuffer(value) ? value.toString('utf-8') : value;
|
|
466
466
|
}
|
|
467
|
+
/** Массив целых из `int[]`/jsonb (невалидные элементы отбрасываются). */
|
|
468
|
+
function asNumberArray(value) {
|
|
469
|
+
if (!Array.isArray(value))
|
|
470
|
+
return [];
|
|
471
|
+
return value.filter((item) => typeof item === 'number' && Number.isFinite(item));
|
|
472
|
+
}
|
|
473
|
+
/**
|
|
474
|
+
* PROP-124: типы использования из БД. Колонка отсутствует (строка без миграции)
|
|
475
|
+
* → `undefined` → нормализация даёт `['git']` (fail-closed). Явно пустой массив
|
|
476
|
+
* сохраняется пустым — как в файловом сторе.
|
|
477
|
+
*/
|
|
478
|
+
function asSshUsages(value) {
|
|
479
|
+
if (!Array.isArray(value))
|
|
480
|
+
return undefined;
|
|
481
|
+
return value.filter((item) => SSH_KEY_USAGES.includes(item));
|
|
482
|
+
}
|
|
467
483
|
function sshKeyToMeta(row, agentIds) {
|
|
468
484
|
const meta = {
|
|
469
485
|
id: row.id,
|
|
470
486
|
name: row.name,
|
|
471
487
|
type: row.type ?? 'user',
|
|
472
488
|
agentIds: [...agentIds],
|
|
489
|
+
// PROP-124: политика ключа (нормализация — как в файловом сторе).
|
|
490
|
+
usages: normalizeSshKeyUsages(asSshUsages(row.usages)),
|
|
491
|
+
allowHosts: normalizeSshKeyAllowHosts(asStringArray(row.allow_hosts)),
|
|
492
|
+
allowPorts: normalizeSshKeyAllowPorts(asNumberArray(row.allow_ports)),
|
|
473
493
|
createdAt: toISO(row.created_at),
|
|
474
494
|
};
|
|
475
495
|
const updatedAt = toISOOrUndefined(row.updated_at);
|
|
@@ -539,6 +559,10 @@ class PostgresSSHKeyRepository {
|
|
|
539
559
|
type: row.type ?? 'user',
|
|
540
560
|
privateKey: bufferToToken(row.private_enc),
|
|
541
561
|
agentIds: asStringArray(row.agent_ids),
|
|
562
|
+
// PROP-124: политика ключа (нормализация — как в файловом сторе).
|
|
563
|
+
usages: normalizeSshKeyUsages(asSshUsages(row.usages)),
|
|
564
|
+
allowHosts: normalizeSshKeyAllowHosts(asStringArray(row.allow_hosts)),
|
|
565
|
+
allowPorts: normalizeSshKeyAllowPorts(asNumberArray(row.allow_ports)),
|
|
542
566
|
createdAt: toISO(row.created_at),
|
|
543
567
|
};
|
|
544
568
|
const updatedAt = toISOOrUndefined(row.updated_at);
|
|
@@ -577,6 +601,12 @@ class PostgresSSHKeyRepository {
|
|
|
577
601
|
const { SSHKeyStoreError } = await loadCore();
|
|
578
602
|
throw new SSHKeyStoreError('invalid', 'Приватный ключ не может быть пустым');
|
|
579
603
|
}
|
|
604
|
+
// PROP-124: политика ключа проверяется так же, как в файловом сторе.
|
|
605
|
+
const policy = validateSshKeyPolicy(input);
|
|
606
|
+
if (!policy.ok) {
|
|
607
|
+
const { SSHKeyStoreError } = await loadCore();
|
|
608
|
+
throw new SSHKeyStoreError('invalid', policy.message);
|
|
609
|
+
}
|
|
580
610
|
await this._assertNameUnique(input.name);
|
|
581
611
|
const { core, key } = await this._masterKey();
|
|
582
612
|
const now = nowISO();
|
|
@@ -584,20 +614,40 @@ class PostgresSSHKeyRepository {
|
|
|
584
614
|
const agentIds = input.agentIds ? [...input.agentIds] : [];
|
|
585
615
|
const privateEnc = core.encryptSecret(input.privateKey, key);
|
|
586
616
|
const passphraseEnc = input.passphrase === undefined ? null : core.encryptSecret(input.passphrase, key);
|
|
617
|
+
// PROP-124: политика ключа (`usages` без значения → `['git']`).
|
|
618
|
+
const usages = normalizeSshKeyUsages(input.usages);
|
|
619
|
+
const allowHosts = normalizeSshKeyAllowHosts(input.allowHosts);
|
|
620
|
+
const allowPorts = normalizeSshKeyAllowPorts(input.allowPorts);
|
|
587
621
|
await this._deps.connection.withTransaction(async (tx) => {
|
|
588
|
-
await tx.query(`INSERT INTO ssh_keys (id, name, type, private_enc, passphrase_enc, created_at, updated_at)
|
|
589
|
-
VALUES ($1,$2,$3,$4::bytea,$5::bytea,$6,$7)`, [id, input.name, input.type ?? 'user', privateEnc, passphraseEnc, now, now]);
|
|
622
|
+
await tx.query(`INSERT INTO ssh_keys (id, name, type, private_enc, passphrase_enc, usages, allow_hosts, allow_ports, created_at, updated_at)
|
|
623
|
+
VALUES ($1,$2,$3,$4::bytea,$5::bytea,$6::text[],$7::text[],$8::integer[],$9,$10)`, [id, input.name, input.type ?? 'user', privateEnc, passphraseEnc, usages, allowHosts, allowPorts, now, now]);
|
|
590
624
|
for (const agentId of agentIds) {
|
|
591
625
|
await tx.query('INSERT INTO ssh_key_agents (key_id, agent_id) VALUES ($1,$2) ON CONFLICT DO NOTHING', [id, agentId]);
|
|
592
626
|
}
|
|
593
627
|
});
|
|
594
|
-
return sshKeyToMeta({
|
|
628
|
+
return sshKeyToMeta({
|
|
629
|
+
id,
|
|
630
|
+
name: input.name,
|
|
631
|
+
type: input.type ?? 'user',
|
|
632
|
+
private_enc: privateEnc,
|
|
633
|
+
passphrase_enc: passphraseEnc,
|
|
634
|
+
usages,
|
|
635
|
+
allow_hosts: allowHosts,
|
|
636
|
+
allow_ports: allowPorts,
|
|
637
|
+
created_at: now,
|
|
638
|
+
updated_at: now,
|
|
639
|
+
}, agentIds);
|
|
595
640
|
}
|
|
596
641
|
async update(id, patch) {
|
|
597
642
|
const existing = await this._getRow(id);
|
|
598
643
|
if (!existing)
|
|
599
644
|
return null;
|
|
600
645
|
const { core, key } = await this._masterKey();
|
|
646
|
+
// PROP-124: проверка политики до изменения записи.
|
|
647
|
+
const policy = validateSshKeyPolicy(patch);
|
|
648
|
+
if (!policy.ok) {
|
|
649
|
+
throw new core.SSHKeyStoreError('invalid', policy.message);
|
|
650
|
+
}
|
|
601
651
|
if (patch.name !== undefined && patch.name.toLowerCase() !== existing.name.toLowerCase()) {
|
|
602
652
|
await this._assertNameUnique(patch.name, id);
|
|
603
653
|
}
|
|
@@ -613,11 +663,22 @@ class PostgresSSHKeyRepository {
|
|
|
613
663
|
? null
|
|
614
664
|
: bufferToToken(existing.passphrase_enc);
|
|
615
665
|
const updatedAt = nowISO();
|
|
666
|
+
// PROP-124: политика ключа (пустое поле в patch = «не менять»).
|
|
667
|
+
const nextUsages = patch.usages !== undefined
|
|
668
|
+
? normalizeSshKeyUsages(patch.usages)
|
|
669
|
+
: normalizeSshKeyUsages(asSshUsages(existing.usages));
|
|
670
|
+
const nextAllowHosts = patch.allowHosts !== undefined
|
|
671
|
+
? normalizeSshKeyAllowHosts(patch.allowHosts)
|
|
672
|
+
: normalizeSshKeyAllowHosts(asStringArray(existing.allow_hosts));
|
|
673
|
+
const nextAllowPorts = patch.allowPorts !== undefined
|
|
674
|
+
? normalizeSshKeyAllowPorts(patch.allowPorts)
|
|
675
|
+
: normalizeSshKeyAllowPorts(asNumberArray(existing.allow_ports));
|
|
616
676
|
const agentIds = patch.agentIds !== undefined ? [...patch.agentIds] : await this._agentIds(id);
|
|
617
677
|
await this._deps.connection.withTransaction(async (tx) => {
|
|
618
678
|
await tx.query(`UPDATE ssh_keys
|
|
619
|
-
SET name = $2, type = $3, private_enc = $4::bytea, passphrase_enc = $5::bytea,
|
|
620
|
-
|
|
679
|
+
SET name = $2, type = $3, private_enc = $4::bytea, passphrase_enc = $5::bytea,
|
|
680
|
+
usages = $6::text[], allow_hosts = $7::text[], allow_ports = $8::integer[], updated_at = $9
|
|
681
|
+
WHERE id = $1`, [id, nextName, nextType, nextPrivate, nextPassphrase, nextUsages, nextAllowHosts, nextAllowPorts, updatedAt]);
|
|
621
682
|
if (patch.agentIds !== undefined) {
|
|
622
683
|
await tx.query('DELETE FROM ssh_key_agents WHERE key_id = $1', [id]);
|
|
623
684
|
for (const agentId of agentIds) {
|
|
@@ -631,6 +692,9 @@ class PostgresSSHKeyRepository {
|
|
|
631
692
|
type: nextType,
|
|
632
693
|
private_enc: nextPrivate,
|
|
633
694
|
passphrase_enc: nextPassphrase,
|
|
695
|
+
usages: nextUsages,
|
|
696
|
+
allow_hosts: nextAllowHosts,
|
|
697
|
+
allow_ports: nextAllowPorts,
|
|
634
698
|
created_at: existing.created_at,
|
|
635
699
|
updated_at: updatedAt,
|
|
636
700
|
}, agentIds);
|
|
@@ -758,6 +822,8 @@ function mcpRowToEntry(row) {
|
|
|
758
822
|
trust: row.trust ?? 'community',
|
|
759
823
|
enabled: row.enabled !== false,
|
|
760
824
|
enabledByDefault: row.enabled_by_default === true,
|
|
825
|
+
// PROP-125: режим доставки; колонка отсутствует/пуста — `auto`.
|
|
826
|
+
remoteMode: row.remote_mode ?? 'auto',
|
|
761
827
|
createdAt: toISO(row.created_at),
|
|
762
828
|
updatedAt: toISO(row.updated_at),
|
|
763
829
|
};
|
|
@@ -801,6 +867,8 @@ class PostgresMcpRegistryRepository {
|
|
|
801
867
|
trust: input.trust ?? (input.origin === 'instance' ? 'builtin' : 'community'),
|
|
802
868
|
enabled: input.enabled ?? true,
|
|
803
869
|
enabledByDefault: input.enabledByDefault ?? input.config.enabledByDefault ?? false,
|
|
870
|
+
// PROP-125: режим доставки в локальные сессии гибрида (дефолт `auto`).
|
|
871
|
+
remoteMode: input.remoteMode ?? 'auto',
|
|
804
872
|
createdAt: now,
|
|
805
873
|
updatedAt: now,
|
|
806
874
|
};
|
|
@@ -817,8 +885,8 @@ class PostgresMcpRegistryRepository {
|
|
|
817
885
|
}
|
|
818
886
|
async _insert(entry) {
|
|
819
887
|
await this._db().query(`INSERT INTO mcp_registry
|
|
820
|
-
(id, schema_version, name, config, origin, author, trust, enabled, enabled_by_default, created_at, updated_at)
|
|
821
|
-
VALUES ($1,$2,$3,$4::jsonb,$5,$6::jsonb,$7::jsonb,$8,$9,$10,$11)`, [
|
|
888
|
+
(id, schema_version, name, config, origin, author, trust, enabled, enabled_by_default, remote_mode, created_at, updated_at)
|
|
889
|
+
VALUES ($1,$2,$3,$4::jsonb,$5,$6::jsonb,$7::jsonb,$8,$9,$10,$11,$12)`, [
|
|
822
890
|
entry.id,
|
|
823
891
|
entry.schemaVersion,
|
|
824
892
|
entry.name,
|
|
@@ -828,6 +896,7 @@ class PostgresMcpRegistryRepository {
|
|
|
828
896
|
jsonParam(entry.trust),
|
|
829
897
|
entry.enabled,
|
|
830
898
|
entry.enabledByDefault,
|
|
899
|
+
entry.remoteMode ?? 'auto',
|
|
831
900
|
entry.createdAt,
|
|
832
901
|
entry.updatedAt,
|
|
833
902
|
]);
|
|
@@ -851,13 +920,14 @@ class PostgresMcpRegistryRepository {
|
|
|
851
920
|
trust: patch.trust ?? entry.trust,
|
|
852
921
|
enabled: patch.enabled ?? entry.enabled,
|
|
853
922
|
enabledByDefault: patch.enabledByDefault ?? entry.enabledByDefault,
|
|
923
|
+
remoteMode: patch.remoteMode ?? entry.remoteMode ?? 'auto',
|
|
854
924
|
schemaVersion: MCP_REGISTRY_SCHEMA_VERSION,
|
|
855
925
|
updatedAt: nowISO(),
|
|
856
926
|
};
|
|
857
927
|
try {
|
|
858
928
|
await this._db().query(`UPDATE mcp_registry
|
|
859
929
|
SET name = $2, config = $3::jsonb, origin = $4, trust = $5::jsonb,
|
|
860
|
-
enabled = $6, enabled_by_default = $7,
|
|
930
|
+
enabled = $6, enabled_by_default = $7, remote_mode = $8, schema_version = $9, updated_at = $10
|
|
861
931
|
WHERE id = $1`, [
|
|
862
932
|
id,
|
|
863
933
|
updated.name,
|
|
@@ -866,6 +936,7 @@ class PostgresMcpRegistryRepository {
|
|
|
866
936
|
jsonParam(updated.trust),
|
|
867
937
|
updated.enabled,
|
|
868
938
|
updated.enabledByDefault,
|
|
939
|
+
updated.remoteMode ?? 'auto',
|
|
869
940
|
updated.schemaVersion,
|
|
870
941
|
updated.updatedAt,
|
|
871
942
|
]);
|
|
@@ -33,6 +33,7 @@
|
|
|
33
33
|
*/
|
|
34
34
|
import type { ContextCategory, ContextFileContent, ContextFileInfo } from '@itphx/synth-shared';
|
|
35
35
|
import type { ContextFileRepository, StorageContext } from '@itphx/synth-core';
|
|
36
|
+
import type { ExecutionEnvironmentKind } from '@itphx/synth-core';
|
|
36
37
|
import type { PortDeps } from './deps.js';
|
|
37
38
|
/** Часть `StorageContext`, которой владеет группа «contextFiles». */
|
|
38
39
|
export type ContextFilePorts = Pick<StorageContext, 'contextFiles'>;
|
|
@@ -98,8 +99,11 @@ export declare class PgContextFileRepository implements ContextFileRepository, C
|
|
|
98
99
|
getSchedulerNotice(language?: string): string;
|
|
99
100
|
getSchedulerTurnNotice(language?: string): string;
|
|
100
101
|
getSubagentNotice(language?: string): string;
|
|
102
|
+
getBackgroundNotice(language?: string): string;
|
|
101
103
|
getMaxStepsPrompt(language?: string): string;
|
|
104
|
+
getTodoFinalizePrompt(language?: string): string;
|
|
102
105
|
getSummarizerPrompt(language?: string): string;
|
|
106
|
+
getEnvironment(kind: ExecutionEnvironmentKind, language?: string): string;
|
|
103
107
|
getCompactorPrompt(language?: string): string;
|
|
104
108
|
getUserContextTemplate(language?: string): string;
|
|
105
109
|
getCompressedDialogTemplate(language?: string): string;
|
|
@@ -107,6 +111,8 @@ export declare class PgContextFileRepository implements ContextFileRepository, C
|
|
|
107
111
|
getMediaDeriveTemplate(language?: string): string;
|
|
108
112
|
getStickyNotesTemplate(language?: string): string;
|
|
109
113
|
getRoutingInstructions(language?: string): string;
|
|
114
|
+
getContentRules(language?: string): string;
|
|
115
|
+
/** @deprecated Алиас `getContentRules` (порт: обратная совместимость). */
|
|
110
116
|
getRules(language?: string): string;
|
|
111
117
|
getGatewayInstructions(language?: string): string;
|
|
112
118
|
getMemoryInstructions(language?: string): string;
|
|
@@ -111,12 +111,21 @@ export class PgContextFileRepository {
|
|
|
111
111
|
getSubagentNotice(language) {
|
|
112
112
|
return this._config.getSubagentNotice(language);
|
|
113
113
|
}
|
|
114
|
+
getBackgroundNotice(language) {
|
|
115
|
+
return this._config.getBackgroundNotice(language);
|
|
116
|
+
}
|
|
114
117
|
getMaxStepsPrompt(language) {
|
|
115
118
|
return this._config.getMaxStepsPrompt(language);
|
|
116
119
|
}
|
|
120
|
+
getTodoFinalizePrompt(language) {
|
|
121
|
+
return this._config.getTodoFinalizePrompt(language);
|
|
122
|
+
}
|
|
117
123
|
getSummarizerPrompt(language) {
|
|
118
124
|
return this._config.getSummarizerPrompt(language);
|
|
119
125
|
}
|
|
126
|
+
getEnvironment(kind, language) {
|
|
127
|
+
return this._config.getEnvironment(kind, language);
|
|
128
|
+
}
|
|
120
129
|
getCompactorPrompt(language) {
|
|
121
130
|
return this._config.getCompactorPrompt(language);
|
|
122
131
|
}
|
|
@@ -138,6 +147,10 @@ export class PgContextFileRepository {
|
|
|
138
147
|
getRoutingInstructions(language) {
|
|
139
148
|
return this._config.getRoutingInstructions(language);
|
|
140
149
|
}
|
|
150
|
+
getContentRules(language) {
|
|
151
|
+
return this._config.getContentRules(language);
|
|
152
|
+
}
|
|
153
|
+
/** @deprecated Алиас `getContentRules` (порт: обратная совместимость). */
|
|
141
154
|
getRules(language) {
|
|
142
155
|
return this._config.getRules(language);
|
|
143
156
|
}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* `enabled` и `target.mode !== 'ephemeral'` (SQL `EXISTS` по `target->>'sessionId'`);
|
|
7
7
|
* Job-история — append-only (`jobs.seq`), `list` — последние N в порядке добавления.
|
|
8
8
|
*/
|
|
9
|
-
import { generateId } from '@itphx/synth-shared';
|
|
9
|
+
import { generateId, SCHEDULE_PROJECT_REQUIRED_ERROR, } from '@itphx/synth-shared';
|
|
10
10
|
import { jsonbParam } from '../json-param.js';
|
|
11
11
|
import { compact, toInt, toIso, toIsoRequired } from './events-core.js';
|
|
12
12
|
function toSchedule(row) {
|
|
@@ -14,6 +14,8 @@ function toSchedule(row) {
|
|
|
14
14
|
id: row.id,
|
|
15
15
|
name: row.name,
|
|
16
16
|
enabled: row.enabled,
|
|
17
|
+
// PROP-141: пустая строка — «проект не определён» (легаси-запись).
|
|
18
|
+
projectId: row.project_id ?? '',
|
|
17
19
|
cron: row.cron ?? undefined,
|
|
18
20
|
every: row.every ?? undefined,
|
|
19
21
|
target: (row.target ?? { mode: 'ephemeral' }),
|
|
@@ -60,14 +62,18 @@ export class PgScheduleRepository {
|
|
|
60
62
|
async create(input) {
|
|
61
63
|
const id = `sch_${generateId()}`;
|
|
62
64
|
const now = new Date().toISOString();
|
|
65
|
+
// PROP-141: проект расписания обязателен — запись без проекта не
|
|
66
|
+
// срабатывает (отключается и помечается `project_required`).
|
|
67
|
+
const projectId = input.projectId ?? '';
|
|
68
|
+
const needsProject = !projectId;
|
|
63
69
|
const rows = await this._deps.connection.query(`INSERT INTO schedules
|
|
64
70
|
(id, name, enabled, cron, every, target, prompt, payload, owner_id, catch_up,
|
|
65
|
-
created_at, updated_at)
|
|
66
|
-
VALUES ($1, $2, $3, $4, $5, $6::jsonb, $7, $8::jsonb, $9, $10, $11, $
|
|
71
|
+
project_id, created_at, updated_at, last_error)
|
|
72
|
+
VALUES ($1, $2, $3, $4, $5, $6::jsonb, $7, $8::jsonb, $9, $10, $11, $12, $12, $13)
|
|
67
73
|
RETURNING *`, [
|
|
68
74
|
id,
|
|
69
75
|
input.name,
|
|
70
|
-
input.enabled,
|
|
76
|
+
needsProject ? false : input.enabled,
|
|
71
77
|
input.cron ?? null,
|
|
72
78
|
input.every ?? null,
|
|
73
79
|
jsonbParam(input.target ?? {}),
|
|
@@ -75,7 +81,9 @@ export class PgScheduleRepository {
|
|
|
75
81
|
input.payload !== undefined ? jsonbParam(input.payload) : null,
|
|
76
82
|
input.ownerId ?? null,
|
|
77
83
|
input.catchUp ?? null,
|
|
84
|
+
projectId || null,
|
|
78
85
|
now,
|
|
86
|
+
needsProject ? SCHEDULE_PROJECT_REQUIRED_ERROR : null,
|
|
79
87
|
]);
|
|
80
88
|
return toSchedule(rows[0]);
|
|
81
89
|
}
|
|
@@ -105,6 +113,13 @@ export class PgScheduleRepository {
|
|
|
105
113
|
params.push(jsonbParam(patch.target));
|
|
106
114
|
sets.push(`target = $${params.length}::jsonb`);
|
|
107
115
|
}
|
|
116
|
+
// PROP-141: проект расписания — обязательное денормализованное поле:
|
|
117
|
+
// собственным ключом с `undefined` он не очищается (иначе расписание
|
|
118
|
+
// осталось бы без проекта и перестало бы срабатывать).
|
|
119
|
+
if (patch.projectId !== undefined) {
|
|
120
|
+
params.push(patch.projectId || null);
|
|
121
|
+
sets.push(`project_id = $${params.length}`);
|
|
122
|
+
}
|
|
108
123
|
// Nullable-поля — own-property семантика: собственный ключ со значением
|
|
109
124
|
// `undefined` очищает колонку (`NULL`), отсутствие ключа — не трогает.
|
|
110
125
|
if (Object.hasOwn(patch, 'prompt')) {
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* PG-реализация порта **ожиданий подтверждения прав** (ADR-029, ADR-097).
|
|
3
|
+
*
|
|
4
|
+
* Таблица `pending_approvals` (миграция 035): состав ожидания (тул, аргументы,
|
|
5
|
+
* причина, «виновник») и метаданные (сессия, владелец, момент публикации,
|
|
6
|
+
* таймаут, ход, принципал). Выборка — по сессии.
|
|
7
|
+
*
|
|
8
|
+
* Почему отдельная таблица, а не поле документа сессии: `sessions` пишется
|
|
9
|
+
* полной перезаменой (`save`), а результаты параллельных тулов — точечно
|
|
10
|
+
* (`appendMessage`, ADR-118 §4). Запись ожидания в тот же документ затирала бы
|
|
11
|
+
* точечные записи → гонка lost update.
|
|
12
|
+
*
|
|
13
|
+
* Семантика повторяет файловые реализации core (`FilePendingApprovalStore`) и
|
|
14
|
+
* in-memory (`MemoryPendingApprovalRepository`): upsert по `approvalId`,
|
|
15
|
+
* список с фильтром по сессии, `delete` идемпотентно, `clear` — число снятых
|
|
16
|
+
* записей.
|
|
17
|
+
*/
|
|
18
|
+
import type { PendingApprovalRecord, PendingApprovalRepository, StorageContext } from '@itphx/synth-core';
|
|
19
|
+
import type { PortDeps } from './deps.js';
|
|
20
|
+
/** Часть `StorageContext`, которой владеет группа «ожидания подтверждений». */
|
|
21
|
+
export type PendingApprovalPorts = Pick<StorageContext, 'pendingApprovals'>;
|
|
22
|
+
/** Порт ожиданий подтверждения прав поверх таблицы `pending_approvals`. */
|
|
23
|
+
export declare class PgPendingApprovalRepository implements PendingApprovalRepository {
|
|
24
|
+
private readonly _deps;
|
|
25
|
+
constructor(_deps: PortDeps);
|
|
26
|
+
save(record: PendingApprovalRecord): Promise<void>;
|
|
27
|
+
delete(approvalId: string): Promise<void>;
|
|
28
|
+
list(sessionId?: string): Promise<PendingApprovalRecord[]>;
|
|
29
|
+
clear(sessionId?: string): Promise<number>;
|
|
30
|
+
}
|
|
31
|
+
/** Собрать порт ожиданий подтверждения прав (ADR-029). */
|
|
32
|
+
export declare function buildPendingApprovalPorts(deps: PortDeps): PendingApprovalPorts;
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* PG-реализация порта **ожиданий подтверждения прав** (ADR-029, ADR-097).
|
|
3
|
+
*
|
|
4
|
+
* Таблица `pending_approvals` (миграция 035): состав ожидания (тул, аргументы,
|
|
5
|
+
* причина, «виновник») и метаданные (сессия, владелец, момент публикации,
|
|
6
|
+
* таймаут, ход, принципал). Выборка — по сессии.
|
|
7
|
+
*
|
|
8
|
+
* Почему отдельная таблица, а не поле документа сессии: `sessions` пишется
|
|
9
|
+
* полной перезаменой (`save`), а результаты параллельных тулов — точечно
|
|
10
|
+
* (`appendMessage`, ADR-118 §4). Запись ожидания в тот же документ затирала бы
|
|
11
|
+
* точечные записи → гонка lost update.
|
|
12
|
+
*
|
|
13
|
+
* Семантика повторяет файловые реализации core (`FilePendingApprovalStore`) и
|
|
14
|
+
* in-memory (`MemoryPendingApprovalRepository`): upsert по `approvalId`,
|
|
15
|
+
* список с фильтром по сессии, `delete` идемпотентно, `clear` — число снятых
|
|
16
|
+
* записей.
|
|
17
|
+
*/
|
|
18
|
+
import { jsonbParam } from '../json-param.js';
|
|
19
|
+
import { toIsoRequired } from './events-core.js';
|
|
20
|
+
/** Запись ожидания из колонок. */
|
|
21
|
+
function toRecord(row) {
|
|
22
|
+
const trigger = row.trigger && typeof row.trigger === 'object' && !Array.isArray(row.trigger)
|
|
23
|
+
? row.trigger
|
|
24
|
+
: undefined;
|
|
25
|
+
return {
|
|
26
|
+
approvalId: row.approval_id,
|
|
27
|
+
sessionId: row.session_id,
|
|
28
|
+
...(row.owner_id ? { ownerId: row.owner_id } : {}),
|
|
29
|
+
toolName: row.tool_name,
|
|
30
|
+
arguments: (row.arguments && typeof row.arguments === 'object' && !Array.isArray(row.arguments))
|
|
31
|
+
? row.arguments
|
|
32
|
+
: {},
|
|
33
|
+
reason: row.reason ?? '',
|
|
34
|
+
...(trigger ? { trigger } : {}),
|
|
35
|
+
askedAt: toIsoRequired(row.asked_at),
|
|
36
|
+
timeoutMs: row.timeout_ms ?? 0,
|
|
37
|
+
...(row.turn_id ? { turnId: row.turn_id } : {}),
|
|
38
|
+
...(row.principal ? { principal: row.principal } : {}),
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
/** Порт ожиданий подтверждения прав поверх таблицы `pending_approvals`. */
|
|
42
|
+
export class PgPendingApprovalRepository {
|
|
43
|
+
_deps;
|
|
44
|
+
constructor(_deps) {
|
|
45
|
+
this._deps = _deps;
|
|
46
|
+
}
|
|
47
|
+
async save(record) {
|
|
48
|
+
await this._deps.connection.query(`INSERT INTO pending_approvals
|
|
49
|
+
(approval_id, session_id, owner_id, tool_name, arguments, reason, trigger,
|
|
50
|
+
asked_at, timeout_ms, turn_id, principal)
|
|
51
|
+
VALUES ($1, $2, $3, $4, $5::jsonb, $6, $7::jsonb, $8::timestamptz, $9, $10, $11)
|
|
52
|
+
ON CONFLICT (approval_id) DO UPDATE SET
|
|
53
|
+
session_id = EXCLUDED.session_id,
|
|
54
|
+
owner_id = EXCLUDED.owner_id,
|
|
55
|
+
tool_name = EXCLUDED.tool_name,
|
|
56
|
+
arguments = EXCLUDED.arguments,
|
|
57
|
+
reason = EXCLUDED.reason,
|
|
58
|
+
trigger = EXCLUDED.trigger,
|
|
59
|
+
asked_at = EXCLUDED.asked_at,
|
|
60
|
+
timeout_ms = EXCLUDED.timeout_ms,
|
|
61
|
+
turn_id = EXCLUDED.turn_id,
|
|
62
|
+
principal = EXCLUDED.principal`, [
|
|
63
|
+
record.approvalId,
|
|
64
|
+
record.sessionId,
|
|
65
|
+
record.ownerId ?? null,
|
|
66
|
+
record.toolName,
|
|
67
|
+
jsonbParam(record.arguments ?? {}),
|
|
68
|
+
record.reason ?? '',
|
|
69
|
+
record.trigger ? jsonbParam(record.trigger) : null,
|
|
70
|
+
record.askedAt,
|
|
71
|
+
record.timeoutMs ?? 0,
|
|
72
|
+
record.turnId ?? null,
|
|
73
|
+
record.principal ?? null,
|
|
74
|
+
]);
|
|
75
|
+
}
|
|
76
|
+
async delete(approvalId) {
|
|
77
|
+
await this._deps.connection.query('DELETE FROM pending_approvals WHERE approval_id = $1', [approvalId]);
|
|
78
|
+
}
|
|
79
|
+
async list(sessionId) {
|
|
80
|
+
const params = [];
|
|
81
|
+
let sql = 'SELECT * FROM pending_approvals';
|
|
82
|
+
if (sessionId !== undefined) {
|
|
83
|
+
params.push(sessionId);
|
|
84
|
+
sql += ` WHERE session_id = $${params.length}`;
|
|
85
|
+
}
|
|
86
|
+
// Порядок — «сначала опубликованные» (asked_at возраст., тайбрейкер id).
|
|
87
|
+
sql += ' ORDER BY asked_at ASC, approval_id ASC';
|
|
88
|
+
const rows = await this._deps.connection.query(sql, params);
|
|
89
|
+
return rows.map(toRecord);
|
|
90
|
+
}
|
|
91
|
+
async clear(sessionId) {
|
|
92
|
+
const params = [];
|
|
93
|
+
let sql = 'DELETE FROM pending_approvals';
|
|
94
|
+
if (sessionId !== undefined) {
|
|
95
|
+
params.push(sessionId);
|
|
96
|
+
sql += ` WHERE session_id = $${params.length}`;
|
|
97
|
+
}
|
|
98
|
+
sql += ' RETURNING approval_id';
|
|
99
|
+
const rows = await this._deps.connection.query(sql, params);
|
|
100
|
+
return rows.length;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
/** Собрать порт ожиданий подтверждения прав (ADR-029). */
|
|
104
|
+
export function buildPendingApprovalPorts(deps) {
|
|
105
|
+
return {
|
|
106
|
+
pendingApprovals: new PgPendingApprovalRepository(deps),
|
|
107
|
+
};
|
|
108
|
+
}
|
|
@@ -57,6 +57,16 @@ function sanitize(raw) {
|
|
|
57
57
|
out.chatViewMode = src.chatViewMode;
|
|
58
58
|
if (src.chatDensity === 'normal' || src.chatDensity === 'compact')
|
|
59
59
|
out.chatDensity = src.chatDensity;
|
|
60
|
+
// Рендер сообщений пользователя и диаграмм Mermaid — только известные
|
|
61
|
+
// значения (паритет `DefaultsStore.sanitize`).
|
|
62
|
+
if (src.userMessageMarkdown === 'markdown' || src.userMessageMarkdown === 'plain') {
|
|
63
|
+
out.userMessageMarkdown = src.userMessageMarkdown;
|
|
64
|
+
}
|
|
65
|
+
if (src.mermaidRenderingMode === 'svg' ||
|
|
66
|
+
src.mermaidRenderingMode === 'ascii' ||
|
|
67
|
+
src.mermaidRenderingMode === 'off') {
|
|
68
|
+
out.mermaidRenderingMode = src.mermaidRenderingMode;
|
|
69
|
+
}
|
|
60
70
|
const chatMobile = sanitizeChatScale(src.chatScaleMobile);
|
|
61
71
|
if (chatMobile !== undefined)
|
|
62
72
|
out.chatScaleMobile = chatMobile;
|
|
@@ -4,12 +4,18 @@
|
|
|
4
4
|
* Эталон семантики — `ProjectStore`/`MemoryProjectRepository`:
|
|
5
5
|
* - `create()` — синхронная чистая фабрика (id, `members`, 4 дефолтные колонки
|
|
6
6
|
* плана, пустые `statusMessages`/`log`, `version: 1`, таймстемпы);
|
|
7
|
-
* - `list(
|
|
7
|
+
* - `list(viewer)` — владелец, участник, грант по группе или режим «всем
|
|
8
|
+
* пользователям» (PROP-133); без `viewer` — все проекты, сортировка
|
|
9
|
+
* `updated_at DESC`;
|
|
8
10
|
* - `delete` отсутствующего — не ошибка; `load` отсутствующего — `null`.
|
|
9
11
|
*
|
|
10
12
|
* `members` — child-таблица `project_members` (PK `(project_id,user_id)`,
|
|
11
13
|
* индекс `(user_id)`): `save` заменяет набор участий в той же транзакции, что и
|
|
12
14
|
* строку проекта. `plan`/`log`/`status_messages`/`repos`/`mcp`/`skills` — `jsonb`.
|
|
15
|
+
* PROP-133: `group_members` (`jsonb`) и `everyone_role` (`text`) — состояние
|
|
16
|
+
* списка доступа; `list` сначала сужает выборку SQL'ем (оптимизация), затем
|
|
17
|
+
* **обязательно** проверяет каждую строку резолвером `resolveProjectAccess`
|
|
18
|
+
* (истина — резолвер, не SQL).
|
|
13
19
|
*/
|
|
14
20
|
import type { StorageContext } from '@itphx/synth-core';
|
|
15
21
|
import type { PostgresConnection } from '../pool.js';
|