@taopao/memoir 0.0.0-stage → 0.1.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.
Files changed (84) hide show
  1. package/LICENSE +21 -0
  2. package/README.md +8 -2
  3. package/assets/migrations-pg/0100_baseline.sql +1115 -0
  4. package/assets/migrations-pg/0101_functions.sql +93 -0
  5. package/assets/migrations-pg/0102_views.sql +2425 -0
  6. package/assets/migrations-pg/0103_constraints.sql +147 -0
  7. package/assets/migrations-pg/0104_protection.sql +33 -0
  8. package/assets/migrations-pg/0105_bocom_credit_card.sql +43 -0
  9. package/assets/migrations-pg/0106_psbc_debit_card.sql +87 -0
  10. package/assets/migrations-pg/0107_tailong_debit_card.sql +87 -0
  11. package/assets/migrations-pg/0108_ccb_debit_card.sql +87 -0
  12. package/assets/migrations-pg/0109_ccb_credit_card.sql +63 -0
  13. package/assets/migrations-pg/0110_icbc_debit_card.sql +87 -0
  14. package/assets/migrations-pg/0111_icbc_credit_card.sql +66 -0
  15. package/assets/migrations-pg/0112_boc_debit_card.sql +88 -0
  16. package/assets/migrations-pg/0113_jsb_debit_card.sql +88 -0
  17. package/assets/migrations-pg/0114_cmbc_debit_card.sql +88 -0
  18. package/assets/migrations-pg/0115_hzbank_debit_card.sql +88 -0
  19. package/assets/migrations-pg/0116_unified_bank_documents.sql +197 -0
  20. package/assets/migrations-pg/0117_agent_submissions.sql +50 -0
  21. package/assets/migrations-pg/0118_agent_reversions_analysis.sql +34 -0
  22. package/assets/migrations-pg/0119_agent_extension_registry.sql +72 -0
  23. package/assets/migrations-pg/0120_agent_record_sources.sql +22 -0
  24. package/assets/migrations-pg/0121_agent_extension_deprecation.sql +30 -0
  25. package/assets/migrations-pg/0122_agent_extension_controlled_revert.sql +107 -0
  26. package/assets/migrations-pg/0123_agent_extension_versions.sql +54 -0
  27. package/assets/migrations-pg/0124_agent_extension_retirement_groups.sql +26 -0
  28. package/assets/migrations-pg/0125_agent_candidate_reviews.sql +30 -0
  29. package/assets/migrations-pg/0126_agent_module_lifecycle.sql +93 -0
  30. package/assets/migrations-pg/0127_agent_tasks.sql +64 -0
  31. package/assets/migrations-pg/0128_agent_task_leases.sql +80 -0
  32. package/assets/migrations-pg/0129_agent_task_plans.sql +66 -0
  33. package/assets/migrations-pg/0130_agent_task_submissions.sql +72 -0
  34. package/assets/migrations-pg/0131_agent_task_completions.sql +93 -0
  35. package/assets/migrations-pg/0132_agent_task_changes.sql +113 -0
  36. package/assets/migrations-pg/0133_agent_imported_source_snapshots.sql +152 -0
  37. package/assets/migrations-pg/0134_agent_analysis_datasets.sql +6 -0
  38. package/assets/migrations-pg/0135_agent_maintenance_tasks.sql +139 -0
  39. package/assets/migrations-pg/0136_agent_task_structures.sql +66 -0
  40. package/assets/migrations-pg/0137_agent_personal_identity.sql +149 -0
  41. package/assets/migrations-pg/0138_agent_work_records.sql +24 -0
  42. package/assets/migrations-pg/0139_shared_files.sql +43 -0
  43. package/assets/migrations-pg/0140_shared_script_runs.sql +36 -0
  44. package/assets/migrations-pg/0141_payment_bank_links.sql +96 -0
  45. package/assets/migrations-pg/0142_consumption_order_types_and_places.sql +287 -0
  46. package/assets/migrations-pg/0143_skill_direct_write.sql +330 -0
  47. package/assets/migrations-pg/0144_skill_schema_archive.sql +73 -0
  48. package/assets/migrations-pg/0145_skill_ingest_wiki.sql +91 -0
  49. package/assets/migrations-pg/0146_skill_load.sql +17 -0
  50. package/assets/migrations-pg/0147_drop_agent_schema.sql +147 -0
  51. package/assets/migrations-pg/0148_ingest_lanes.sql +19 -0
  52. package/assets/migrations-pg/0149_account_ownership.sql +233 -0
  53. package/assets/migrations-pg/0150_bank_card_exact_link.sql +24 -0
  54. package/assets/migrations-pg/0151_account_ownership_enforce.sql +35 -0
  55. package/assets/migrations-pg/0152_account_ownership_views.sql +750 -0
  56. package/assets/migrations-pg/0153_web_frontend.sql +34 -0
  57. package/assets/migrations-pg/0154_audio_record_owners.sql +103 -0
  58. package/assets/migrations-pg/0155_ingest_knowledge_tables.sql +171 -0
  59. package/assets/migrations-pg/0156_batch_playbook_note.sql +17 -0
  60. package/assets/migrations-pg/0157_last_contact.sql +166 -0
  61. package/assets/migrations-pg/0158_refund_match_hash_join.sql +91 -0
  62. package/assets/migrations-pg/0159_fact_occurred_time.sql +88 -0
  63. package/assets/migrations-pg/0160_agent_notes.sql +118 -0
  64. package/assets/migrations-pg/0161_life_history.sql +314 -0
  65. package/assets/migrations-pg/0162_person_card.sql +427 -0
  66. package/assets/migrations-pg/0163_parking_drop_personal_defaults.sql +12 -0
  67. package/assets/native/darwin-arm64.node +0 -0
  68. package/assets/playbooks/audio.md +83 -0
  69. package/assets/playbooks/chat.md +37 -0
  70. package/assets/playbooks/common.md +66 -0
  71. package/assets/playbooks/intimate.md +19 -0
  72. package/assets/playbooks/journal.md +17 -0
  73. package/assets/playbooks/orders.md +15 -0
  74. package/assets/playbooks/payments.md +16 -0
  75. package/assets/playbooks/self.md +29 -0
  76. package/bin/install-codex-skill.mjs +77 -0
  77. package/bin/memoir.mjs +5 -0
  78. package/dist/cli.js +34062 -0
  79. package/package.json +40 -4
  80. package/release-manifest.json +432 -0
  81. package/skill/SKILL.md +120 -0
  82. package/skill/references//345/256/211/350/243/205/344/275/215/347/275/256.md +21 -0
  83. package/skill/references//346/225/260/346/215/256/345/217/243/345/276/204.md +36 -0
  84. package/skill/scripts/memoir.mjs +82 -0
@@ -0,0 +1,73 @@
1
+ -- 仅 PostgreSQL:Agent 破坏性结构变更(schema plan/apply)的归档与撤回基础
2
+ -- (方案见 docs/proposals/Agent主导精简Skill重构方案.md 3.6 节,A 方案)。
3
+ --
4
+ -- 业务背景:删字段、改名、改类型、拆表、合表等会动已有数据的结构变更,由 Agent 先给方案、用户同意后执行。
5
+ -- 执行前把受影响的表整表复制到 vault_archive(这是唯一允许的自动数据复制,2026-11-05 用户确认),
6
+ -- 撤回时按归档快照反向恢复结构并回填数据。为此需要:
7
+ -- 1. vault_archive schema:只放归档快照,快照建成后只读,不自动删除;
8
+ -- 2. vault_batches 增加批次类型 schema;
9
+ -- 3. schema_changes 增加原因、用户同意原话、归档快照名与行数、结构详情,kind 增加破坏性类型。
10
+ -- 只新增 schema、可空列与放宽 CHECK,不改写、不删除任何已有数据。
11
+ SELECT pg_advisory_xact_lock(hashtext('relation-vault:write'));
12
+
13
+ -- 1. 归档 schema。授权照抄 persons 的 SELECT 角色(只读与应用角色能看快照,但不能改),不写死角色名。
14
+ CREATE SCHEMA IF NOT EXISTS vault_archive;
15
+ COMMENT ON SCHEMA vault_archive IS '破坏性结构变更前的归档快照(表名 <原表>__<时间>),撤回时据此恢复;不自动删除,清理需用户明确要求';
16
+ REVOKE ALL ON SCHEMA vault_archive FROM PUBLIC;
17
+ DO $$ DECLARE g record; BEGIN
18
+ FOR g IN SELECT DISTINCT r.rolname
19
+ FROM pg_class c CROSS JOIN LATERAL aclexplode(coalesce(c.relacl, acldefault('r', c.relowner))) a
20
+ JOIN pg_roles r ON r.oid = a.grantee
21
+ WHERE c.oid = 'public.persons'::regclass AND a.grantee <> c.relowner AND a.privilege_type = 'SELECT'
22
+ LOOP
23
+ EXECUTE format('GRANT USAGE ON SCHEMA vault_archive TO %I', g.rolname);
24
+ END LOOP;
25
+ END $$;
26
+
27
+ -- 快照登记:建成后只读(UPDATE/DELETE/TRUNCATE 被拒绝),按 persons 授 SELECT。
28
+ -- 快照由 CREATE TABLE … AS 一次性写入,不经过行触发器;清理归档用 DROP TABLE,由用户明确要求时执行。
29
+ CREATE OR REPLACE FUNCTION public.vault_register_archive_table(tbl text) RETURNS void LANGUAGE plpgsql AS $$
30
+ DECLARE rel regclass := format('vault_archive.%I', tbl)::regclass; g record;
31
+ BEGIN
32
+ EXECUTE format('CREATE TRIGGER %I BEFORE UPDATE OR DELETE ON %s FOR EACH ROW EXECUTE FUNCTION public.vault_guard(''append'')', left('trg_' || tbl, 57) || '_ro', rel);
33
+ EXECUTE format('CREATE TRIGGER %I BEFORE TRUNCATE ON %s FOR EACH STATEMENT EXECUTE FUNCTION public.vault_guard(''append'')', left('trg_' || tbl, 57) || '_trunc', rel);
34
+ EXECUTE format('REVOKE ALL ON %s FROM PUBLIC', rel);
35
+ FOR g IN SELECT DISTINCT r.rolname
36
+ FROM pg_class c CROSS JOIN LATERAL aclexplode(coalesce(c.relacl, acldefault('r', c.relowner))) a
37
+ JOIN pg_roles r ON r.oid = a.grantee
38
+ WHERE c.oid = 'public.persons'::regclass AND a.grantee <> c.relowner AND a.privilege_type = 'SELECT'
39
+ LOOP
40
+ EXECUTE format('GRANT SELECT ON %s TO %I', rel, g.rolname);
41
+ END LOOP;
42
+ END $$;
43
+ COMMENT ON FUNCTION public.vault_register_archive_table(text) IS '归档快照建成后调用:拒绝修改与 TRUNCATE,按 persons 授 SELECT';
44
+
45
+ -- 2. 批次类型增加 schema(一次 schema apply 一个批次)。
46
+ ALTER TABLE public.vault_batches DROP CONSTRAINT IF EXISTS vault_batches_kind_check;
47
+ ALTER TABLE public.vault_batches ADD CONSTRAINT vault_batches_kind_check
48
+ CHECK (kind IN ('remember', 'undo', 'schema'));
49
+ COMMENT ON COLUMN public.vault_batches.kind IS 'remember=记录写入,schema=经用户同意的结构变更(schema apply),undo=撤回某个批次';
50
+
51
+ -- 3. 结构变更日志扩展。拆表、合表、抽表不是单条 DDL,按组成它们的原子变更
52
+ -- (create_table + 数据搬移 + drop_column/drop_table 等)记录,同一批次、同一原因与同意原话。
53
+ ALTER TABLE public.schema_changes DROP CONSTRAINT IF EXISTS schema_changes_kind_check;
54
+ ALTER TABLE public.schema_changes ADD CONSTRAINT schema_changes_kind_check CHECK (kind IN (
55
+ 'create_table', 'add_column', 'create_view', 'replace_view', 'create_index',
56
+ 'archive', 'drop_column', 'rename_column', 'alter_type', 'alter_column',
57
+ 'rename_table', 'drop_table', 'drop_view', 'rename_view',
58
+ 'drop_index', 'rename_index', 'add_constraint', 'drop_constraint'
59
+ ));
60
+ ALTER TABLE public.schema_changes ADD COLUMN reason text;
61
+ ALTER TABLE public.schema_changes ADD COLUMN user_consent text;
62
+ ALTER TABLE public.schema_changes ADD COLUMN archive_table text;
63
+ ALTER TABLE public.schema_changes ADD COLUMN archive_rows bigint;
64
+ ALTER TABLE public.schema_changes ADD COLUMN detail_json text CHECK (detail_json IS NULL OR public.vault_json_valid(detail_json));
65
+ COMMENT ON COLUMN public.schema_changes.kind IS
66
+ '新增类:create_table/add_column/create_view/replace_view/create_index;'
67
+ '破坏性:drop_column/rename_column/alter_type(改类型)/alter_column(默认值、非空)/rename_table/drop_table/drop_view/rename_view/drop_index/rename_index/add_constraint/drop_constraint;'
68
+ 'archive=执行前的归档快照(每张受影响表一行)';
69
+ COMMENT ON COLUMN public.schema_changes.reason IS 'schema apply 时 Agent 写的变更原因';
70
+ COMMENT ON COLUMN public.schema_changes.user_consent IS 'schema apply 时用户同意执行的原话';
71
+ COMMENT ON COLUMN public.schema_changes.archive_table IS 'archive 行:归档快照表名(vault_archive.<原表>__<时间>)';
72
+ COMMENT ON COLUMN public.schema_changes.archive_rows IS 'archive 行:归档的行数';
73
+ COMMENT ON COLUMN public.schema_changes.detail_json IS '撤回所需的结构详情(JSON):archive 行为归档前表结构,drop_view/replace_view/rename_view 为原视图定义,新建对象为其 oid';
@@ -0,0 +1,91 @@
1
+ -- 仅 PostgreSQL:精简 Skill 第 4 步——整理新数据(ingest)、Wiki 读写、体检(checkup)的结构基础。
2
+ -- 方案见 docs/proposals/Agent主导精简Skill重构方案.md 3.3、3.7、3.8 节。
3
+ --
4
+ -- 业务背景:
5
+ -- 1. 用户说"整理新数据"时,Agent 按人物/来源增量读取上次整理之后的聊天、录音、随笔、账单,
6
+ -- 把事实写表、叙述写 Wiki;进度存游标表 ingest_cursors,中断后可从游标续做;
7
+ -- 2. 一次整理跨多次命令调用(多次 remember、多次 wiki put),统一归到一个 kind=ingest 的批次,
8
+ -- undo <批次ID> 时表数据与 Wiki 修订整体撤回;
9
+ -- 3. wiki_revisions 是只增表,撤回不能删除修订,因此给修订记录批次号,撤回时据此找回批次前的版本、
10
+ -- 追加一条"撤回"修订恢复正文;
11
+ -- 4. 单独的 wiki put 与体检修复也各自成批(kind=wiki / checkup),同样可撤回。
12
+ -- 只新增表、列、约束取值与注释,不改写、不删除任何已有数据。
13
+ SELECT pg_advisory_xact_lock(hashtext('relation-vault:write'));
14
+
15
+ -- 1. 批次种类增加 ingest(整理新数据)、wiki(单独的 Wiki 写入)、checkup(体检自动修复)。
16
+ ALTER TABLE public.vault_batches DROP CONSTRAINT IF EXISTS vault_batches_kind_check;
17
+ ALTER TABLE public.vault_batches ADD CONSTRAINT vault_batches_kind_check
18
+ CHECK (kind IN ('remember', 'undo', 'schema', 'ingest', 'wiki', 'checkup'));
19
+ COMMENT ON COLUMN public.vault_batches.kind IS
20
+ 'remember=记录写入,schema=经用户同意的结构变更,ingest=整理新数据(可跨多次调用),wiki=单独的 Wiki 写入,checkup=体检自动修复,undo=撤回某个批次';
21
+
22
+ -- 整理批次跨多次调用:begin 时为空表示进行中,mark 推进游标后写入结束时间;其他种类创建即结束,保持 NULL。
23
+ ALTER TABLE public.vault_batches ADD COLUMN finished_at text;
24
+ COMMENT ON COLUMN public.vault_batches.finished_at IS
25
+ '整理批次(kind=ingest)结束时间;NULL 且未撤回表示整理进行中,remember/wiki put 可带 batch_id 归入该批次';
26
+
27
+ -- 2. 整理游标:每个"范围 × 来源"一行。范围为人物 ID,或 * 表示不分人物的整体整理。
28
+ -- 位置用 (position_at, position_key) 二元组表示,与读取时的排序键一致:
29
+ -- chat=消息发送时间+msg_id;audio=录音开始时间+sha1:八位句序;journal=写作时间+随笔ID;
30
+ -- orders=下单(或支付)时间+平台:订单号;payments=交易时间+平台:交易号。
31
+ -- pending_* 是进行中批次已读到的位置,mark 时转为正式位置;撤回整理批次时经审计还原到批次前。
32
+ CREATE TABLE public.ingest_cursors (
33
+ scope text NOT NULL CHECK (scope = '*' OR scope ~ '^[a-z0-9][a-z0-9-]*$'),
34
+ source text NOT NULL CHECK (source IN ('chat', 'audio', 'journal', 'orders', 'payments')),
35
+ position_at text,
36
+ position_key text,
37
+ batch_id text REFERENCES public.vault_batches(id),
38
+ pending_at text,
39
+ pending_key text,
40
+ pending_batch_id text REFERENCES public.vault_batches(id),
41
+ created_at text NOT NULL DEFAULT public.vault_now_text(),
42
+ created_by text NOT NULL DEFAULT public.vault_current_actor(),
43
+ updated_at text NOT NULL DEFAULT public.vault_now_text(),
44
+ updated_by text NOT NULL DEFAULT public.vault_current_actor(),
45
+ PRIMARY KEY (scope, source),
46
+ CHECK ((position_at IS NULL) = (position_key IS NULL)),
47
+ CHECK ((pending_at IS NULL) = (pending_key IS NULL) AND (pending_at IS NULL) = (pending_batch_id IS NULL))
48
+ );
49
+ COMMENT ON TABLE public.ingest_cursors IS '整理新数据的游标:每个范围(人物或 *)× 来源已整理到的位置;ingest status 据此计算新增数量';
50
+ COMMENT ON COLUMN public.ingest_cursors.scope IS '范围:人物 ID,或 * 表示不分人物的整体整理;某人的有效位置取本人范围与 * 中较晚者';
51
+ COMMENT ON COLUMN public.ingest_cursors.source IS '来源:chat=微信聊天,audio=录音,journal=随笔(不含 Skill 原话),orders=订单,payments=支付账单';
52
+ COMMENT ON COLUMN public.ingest_cursors.position_at IS '已整理到的时间(上海时间文本),与 position_key 组成排序位置';
53
+ COMMENT ON COLUMN public.ingest_cursors.position_key IS '已整理到的行键(同一时间内的次序)';
54
+ COMMENT ON COLUMN public.ingest_cursors.batch_id IS '最近一次推进本游标的整理批次';
55
+ COMMENT ON COLUMN public.ingest_cursors.pending_at IS '进行中批次已读到的时间,ingest mark 时转为正式位置';
56
+ COMMENT ON COLUMN public.ingest_cursors.pending_key IS '进行中批次已读到的行键';
57
+ COMMENT ON COLUMN public.ingest_cursors.pending_batch_id IS '正在读取本游标的整理批次';
58
+ COMMENT ON COLUMN public.ingest_cursors.created_at IS '创建时间(上海时间)';
59
+ COMMENT ON COLUMN public.ingest_cursors.created_by IS '创建者';
60
+ COMMENT ON COLUMN public.ingest_cursors.updated_at IS '更新时间(上海时间)';
61
+ COMMENT ON COLUMN public.ingest_cursors.updated_by IS '更新者';
62
+ -- 与 Agent 新建表一致:写会话保护、TRUNCATE 拒绝、按主键逐行审计(撤回整理批次时还原游标)、版本号与授权。
63
+ SELECT public.vault_register_skill_table('ingest_cursors');
64
+
65
+ -- 3. Wiki 修订记录所属批次。历史修订保持 NULL(网页编辑、memoir build 等不经批次的写入)。
66
+ ALTER TABLE public.wiki_revisions ADD COLUMN batch_id text REFERENCES public.vault_batches(id);
67
+ CREATE INDEX ix_wiki_revisions_batch ON public.wiki_revisions(batch_id, slug, rev) WHERE batch_id IS NOT NULL;
68
+ COMMENT ON COLUMN public.wiki_revisions.batch_id IS
69
+ '产生本修订的 Skill 批次(ingest/wiki/checkup/undo);撤回批次时据此恢复到批次前的修订,NULL=网页编辑或 memoir build';
70
+
71
+ -- 4. Wiki 表的列注释(0143 只补了表注释);已有注释不覆盖。
72
+ DO $$ DECLARE item record; BEGIN
73
+ FOR item IN SELECT * FROM (VALUES
74
+ ('wiki_pages', 'slug', '页面路径:index、log、me/…、people/<人物ID>/profile|topics/…|memories/…|insights/…、reports/体检-YYYY-MM-DD'),
75
+ ('wiki_pages', 'module', '旧模块分组(me/her/us/global);Skill 写入的 me/ 页面为 me,其余为 global'),
76
+ ('wiki_pages', 'title', '页面标题'),
77
+ ('wiki_pages', 'body_md', 'Markdown 正文;数字用视图块 <!-- view:v_xxx … --> … <!-- /view --> 引用,事实以表为准'),
78
+ ('wiki_pages', 'current_rev', '当前修订号,对应 wiki_revisions.rev;wiki put 以此做防覆盖校验'),
79
+ ('wiki_pages', 'page_state', 'draft/published/archived'),
80
+ ('wiki_pages', 'deleted_at', '软删除时间;撤回新建页面的批次时填写'),
81
+ ('wiki_revisions', 'rev', '修订号,同一页面递增'),
82
+ ('wiki_revisions', 'body_md', '该修订的完整正文'),
83
+ ('wiki_revisions', 'reason', '修订原因(如 整理新数据、体检刷新视图块、撤回批次)')
84
+ ) AS t(tbl, col, note)
85
+ LOOP
86
+ IF col_description(('public.' || item.tbl)::regclass,
87
+ (SELECT attnum FROM pg_attribute WHERE attrelid = ('public.' || item.tbl)::regclass AND attname = item.col)) IS NULL THEN
88
+ EXECUTE format('COMMENT ON COLUMN public.%I.%I IS %L', item.tbl, item.col, item.note);
89
+ END IF;
90
+ END LOOP;
91
+ END $$;
@@ -0,0 +1,17 @@
1
+ -- 仅 PostgreSQL:精简 Skill 第 5 步——导入(load / files / import)的结构基础。
2
+ -- 方案见 docs/proposals/Agent主导精简Skill重构方案.md 3.1、3.5 节。
3
+ --
4
+ -- 业务背景:
5
+ -- 1. 新格式数据由 Agent 自己解析成 CSV/JSONL,再用 `memoir skill load` 批量写入已有表("记一下"的批量版);
6
+ -- 每次 load 是一个批次(kind=load),与 remember 相同地走写会话与逐行审计,可由 undo <批次ID> 整体撤回;
7
+ -- 多次 load 可带 --batch 归入同一 load 批次,一起撤回;
8
+ -- 2. 原件存取复用 0139 的 vault_files / vault_file_blobs(只增、按 SHA-256 去重),无需新表;
9
+ -- load 写入行的证据用 evidence_links(source_type='import_file', source_key=<vault_files.id>) 指向原件。
10
+ -- 只放宽批次种类取值并更新注释,不改写、不删除任何已有数据。
11
+ SELECT pg_advisory_xact_lock(hashtext('relation-vault:write'));
12
+
13
+ ALTER TABLE public.vault_batches DROP CONSTRAINT IF EXISTS vault_batches_kind_check;
14
+ ALTER TABLE public.vault_batches ADD CONSTRAINT vault_batches_kind_check
15
+ CHECK (kind IN ('remember', 'undo', 'schema', 'ingest', 'wiki', 'checkup', 'load'));
16
+ COMMENT ON COLUMN public.vault_batches.kind IS
17
+ 'remember=记录写入,schema=经用户同意的结构变更,ingest=整理新数据(可跨多次调用),wiki=单独的 Wiki 写入,checkup=体检自动修复,load=Agent 解析后批量写入(可多次 load 归入同一批次),undo=撤回某个批次';
@@ -0,0 +1,147 @@
1
+ -- 仅 PostgreSQL:精简 Skill 第 8 步——删除旧 Agent 系统遗留的数据库对象。
2
+ -- 方案见 docs/proposals/Agent主导精简Skill重构方案.md 第 5 节第 8 步(决策 21:agent.* 表最后删除)。
3
+ --
4
+ -- 业务背景:
5
+ -- 旧 `memoir agent` 协议(任务租约、候选审核、扩展注册、分析报告、本人/设备登记等)的代码已在第 7 步删除,
6
+ -- agent / agent_ext / agent_archive 三个 schema 及只服务它们的 public 函数、vault_meta 开关列成了无人读写的遗留结构。
7
+ -- 本迁移把它们全部删除;人工/导入/Skill 写入走的 vault_guard、vault_audit、vault_touch 保留。
8
+ --
9
+ -- 数据口径与边界:
10
+ -- 1. 正式库执行前必须由用户手动备份(本迁移不创建备份,遵守“仅手动备份”约束);删除后只能从备份恢复。
11
+ -- 2. agent_ext 存放旧扩展机制建的用户数据表(如金融整理建的 finance_statement_platforms / finance_statement_links)。
12
+ -- 按方案第 4 节,有数据的表原样迁到 public(数据、主键、索引、序列随表移动),去掉引用旧扩展注册的触发器与指向旧 schema 的外键,
13
+ -- 表注释取旧注册说明,再经 vault_register_skill_table 挂写会话保护、审计与授权,此后按普通自建表用 Skill 读写;
14
+ -- 列注释不在此臆造,由“体检”提示补齐。public 已有同名表时整体中止,不覆盖。空表随 schema 删除。
15
+ -- agent_archive(已退役扩展的归档)与 agent schema 内的任务/候选/报告等过程数据按决策直接删除。
16
+ -- 3. public 中若有视图或外键依赖上述 schema(不应存在),同样中止,避免 CASCADE 悄悄删掉 public 对象。
17
+ -- 4. audit_log 中 object_schema='agent' 的历史审计行保留,不改写审计历史;audit_log 的 person_id/device_id/agent_* 列也保留,
18
+ -- 它们只是历史记录列,新写入不再填充。
19
+ SELECT pg_advisory_xact_lock(hashtext('relation-vault:write'));
20
+
21
+ -- 第一段:agent_ext 中有数据的表迁到 public。
22
+ DO $$
23
+ DECLARE
24
+ legacy text[] := ARRAY['agent', 'agent_ext', 'agent_archive'];
25
+ item record;
26
+ extra record;
27
+ row_count bigint;
28
+ note text;
29
+ BEGIN
30
+ FOR item IN
31
+ SELECT c.oid, c.relname
32
+ FROM pg_class c JOIN pg_namespace n ON n.oid = c.relnamespace
33
+ WHERE n.nspname = 'agent_ext' AND c.relkind IN ('r', 'p')
34
+ ORDER BY c.relname
35
+ LOOP
36
+ EXECUTE format('SELECT count(*) FROM (SELECT 1 FROM agent_ext.%I LIMIT 1) t', item.relname) INTO row_count;
37
+ CONTINUE WHEN row_count = 0;
38
+ IF to_regclass(format('public.%I', item.relname)) IS NOT NULL THEN
39
+ RAISE EXCEPTION '旧扩展表 agent_ext.% 与 public 已有表同名,未迁移;请先改名其中一张', item.relname;
40
+ END IF;
41
+ -- 旧触发器(扩展守卫读 agent.extensions、旧审计/版本触发器)随后由 vault_register_skill_table 重建。
42
+ FOR extra IN SELECT tgname FROM pg_trigger WHERE tgrelid = item.oid AND NOT tgisinternal LOOP
43
+ EXECUTE format('DROP TRIGGER %I ON agent_ext.%I', extra.tgname, item.relname);
44
+ END LOOP;
45
+ -- 指向旧 schema 的外键(如引用旧提交/扩展注册)在旧 schema 删除后无意义,先去掉;指向 public 的外键保留。
46
+ FOR extra IN
47
+ SELECT k.conname FROM pg_constraint k
48
+ JOIN pg_class rc ON rc.oid = k.confrelid JOIN pg_namespace rn ON rn.oid = rc.relnamespace
49
+ WHERE k.conrelid = item.oid AND k.contype = 'f' AND rn.nspname = ANY (legacy)
50
+ LOOP
51
+ EXECUTE format('ALTER TABLE agent_ext.%I DROP CONSTRAINT %I', item.relname, extra.conname);
52
+ END LOOP;
53
+ note := NULL;
54
+ IF to_regclass('agent.extensions') IS NOT NULL THEN
55
+ EXECUTE 'SELECT description FROM agent.extensions WHERE schema_name = ''agent_ext'' AND table_name = $1 ORDER BY version DESC LIMIT 1'
56
+ INTO note USING item.relname;
57
+ END IF;
58
+ EXECUTE format('ALTER TABLE agent_ext.%I SET SCHEMA public', item.relname);
59
+ IF obj_description(item.oid, 'pg_class') IS NULL THEN
60
+ EXECUTE format('COMMENT ON TABLE public.%I IS %L', item.relname,
61
+ coalesce(nullif(note, ''), '旧 Agent 扩展表') || '(2026-11-05 由 agent_ext 迁入 public)');
62
+ END IF;
63
+ -- 与 0143 相同口径:text 型标准列与单列 text 主键 id 补默认值,Skill 写入可省略这些列。
64
+ FOR extra IN
65
+ SELECT a.attname FROM pg_attribute a
66
+ WHERE a.attrelid = item.oid AND a.attnum > 0 AND NOT a.attisdropped AND NOT a.atthasdef
67
+ AND a.atttypid = 'text'::regtype AND a.attname IN ('created_at', 'updated_at', 'created_by', 'updated_by')
68
+ LOOP
69
+ EXECUTE format('ALTER TABLE public.%I ALTER COLUMN %I SET DEFAULT %s', item.relname, extra.attname,
70
+ CASE WHEN extra.attname LIKE '%\_at' THEN 'public.vault_now_text()' ELSE 'public.vault_current_actor()' END);
71
+ END LOOP;
72
+ PERFORM public.vault_register_skill_table(item.relname);
73
+ END LOOP;
74
+ END $$;
75
+
76
+ -- 第二段:public 等其他 schema 仍依赖旧 schema 时中止,整个迁移事务回滚。
77
+ DO $$
78
+ DECLARE
79
+ legacy text[] := ARRAY['agent', 'agent_ext', 'agent_archive'];
80
+ dependents text[] := ARRAY[]::text[];
81
+ BEGIN
82
+ -- 依赖旧 schema 中表的视图(经 pg_rewrite)与外键,只统计依赖方位于旧 schema 之外的情况。
83
+ SELECT coalesce(array_agg(DISTINCT name), ARRAY[]::text[]) INTO dependents FROM (
84
+ SELECT dn.nspname || '.' || dc.relname AS name
85
+ FROM pg_depend d
86
+ JOIN pg_rewrite r ON d.classid = 'pg_rewrite'::regclass AND d.objid = r.oid
87
+ JOIN pg_class dc ON dc.oid = r.ev_class JOIN pg_namespace dn ON dn.oid = dc.relnamespace
88
+ JOIN pg_class rc ON d.refclassid = 'pg_class'::regclass AND d.refobjid = rc.oid
89
+ JOIN pg_namespace rn ON rn.oid = rc.relnamespace
90
+ WHERE rn.nspname = ANY (legacy) AND NOT dn.nspname = ANY (legacy)
91
+ UNION
92
+ SELECT dn.nspname || '.' || dc.relname || '(外键 ' || k.conname || ')'
93
+ FROM pg_constraint k
94
+ JOIN pg_class dc ON dc.oid = k.conrelid JOIN pg_namespace dn ON dn.oid = dc.relnamespace
95
+ JOIN pg_class rc ON rc.oid = k.confrelid JOIN pg_namespace rn ON rn.oid = rc.relnamespace
96
+ WHERE k.contype = 'f' AND rn.nspname = ANY (legacy) AND NOT dn.nspname = ANY (legacy)
97
+ ) found;
98
+ IF cardinality(dependents) > 0 THEN
99
+ RAISE EXCEPTION '以下对象依赖旧 Agent schema,未删除:%', array_to_string(dependents, ', ');
100
+ END IF;
101
+ END $$;
102
+
103
+ -- 写保护函数去掉旧 Agent 开关分支(原先 actor 为 agent:* 或写 agent schema 时读 vault_meta.agent_writes_enabled);
104
+ -- 其余规则与 0126 版本逐条一致:禁止 TRUNCATE、必须在写会话内、只增表、事实表、备份记录、导入批次保护。
105
+ CREATE OR REPLACE FUNCTION public.vault_guard() RETURNS trigger LANGUAGE plpgsql SECURITY INVOKER SET search_path=pg_catalog,pg_temp AS $$
106
+ DECLARE actor text := nullif(current_setting('vault.actor',true),'');
107
+ BEGIN
108
+ IF TG_OP='TRUNCATE' THEN RAISE EXCEPTION '禁止 TRUNCATE'; END IF;
109
+ IF actor IS NULL THEN RAISE EXCEPTION '未设置写入会话'; END IF;
110
+ IF TG_ARGV[0]='append' AND TG_OP IN('UPDATE','DELETE') THEN RAISE EXCEPTION '只增表禁止修改或删除'; END IF;
111
+ IF TG_ARGV[0]='fact' AND actor NOT IN('importer','migration') THEN RAISE EXCEPTION '事实表只允许导入程序修改'; END IF;
112
+ IF TG_TABLE_NAME='backup_log' AND TG_OP='DELETE' THEN RAISE EXCEPTION '备份记录不能删除'; END IF;
113
+ IF TG_TABLE_NAME='import_batches' THEN
114
+ IF TG_OP='DELETE' THEN RAISE EXCEPTION '导入批次不能删除'; END IF;
115
+ IF TG_OP='UPDATE' AND OLD.status<>'running' AND actor<>'migration' THEN RAISE EXCEPTION '已完成的导入批次不能修改'; END IF;
116
+ END IF;
117
+ IF TG_OP='DELETE' THEN RETURN OLD; END IF; RETURN NEW;
118
+ END $$;
119
+
120
+ -- vault_meta 上的 Agent 开关:先删触发器再删列与函数。
121
+ DROP TRIGGER IF EXISTS trg_vault_meta_agent_state ON public.vault_meta;
122
+ DROP TRIGGER IF EXISTS trg_vault_meta_agent_truncate ON public.vault_meta;
123
+ ALTER TABLE public.vault_meta DROP COLUMN IF EXISTS agent_writes_enabled;
124
+ ALTER TABLE public.vault_meta DROP COLUMN IF EXISTS agent_runtime_revision;
125
+
126
+ -- 三个旧 schema 连同其中的表、索引、触发器、授权一起删除(前置检查已保证不会波及其他 schema)。
127
+ DROP SCHEMA IF EXISTS agent_ext CASCADE;
128
+ DROP SCHEMA IF EXISTS agent_archive CASCADE;
129
+ DROP SCHEMA IF EXISTS agent CASCADE;
130
+
131
+ -- 只服务旧系统的 public 函数(扩展守卫/受控回滚、任务各阶段守卫、Agent 开关)。
132
+ DROP FUNCTION IF EXISTS public.vault_agent_state_guard();
133
+ DROP FUNCTION IF EXISTS public.vault_agent_writes_enabled();
134
+ DROP FUNCTION IF EXISTS public.vault_extension_guard();
135
+ DROP FUNCTION IF EXISTS public.vault_lock_extension_revert(text, text);
136
+ DROP FUNCTION IF EXISTS public.vault_restore_extension_revert(text, text, text, bigint);
137
+ DROP FUNCTION IF EXISTS public.vault_task_change_guard();
138
+ DROP FUNCTION IF EXISTS public.vault_task_completion_guard();
139
+ DROP FUNCTION IF EXISTS public.vault_task_lease_guard();
140
+ DROP FUNCTION IF EXISTS public.vault_task_maintenance_guard();
141
+ DROP FUNCTION IF EXISTS public.vault_task_open_guard();
142
+ DROP FUNCTION IF EXISTS public.vault_task_plan_guard();
143
+ DROP FUNCTION IF EXISTS public.vault_task_registration_guard();
144
+ DROP FUNCTION IF EXISTS public.vault_task_snapshot_guard();
145
+ DROP FUNCTION IF EXISTS public.vault_task_source_guard();
146
+ DROP FUNCTION IF EXISTS public.vault_task_structure_guard();
147
+ DROP FUNCTION IF EXISTS public.vault_task_submission_guard();
@@ -0,0 +1,19 @@
1
+ -- 仅 PostgreSQL:整理批次按“整理线”区分,支持多个 Agent 并行整理不同来源(2026-11-06 用户要求多 Agent 并行跑首轮整理)。
2
+ --
3
+ -- 业务背景:
4
+ -- 0145 起整理批次(vault_batches.kind='ingest')全局只认一个进行中的批次:ingest begin 发现任何未结束批次都直接返回它续做。
5
+ -- 多个 Agent 同时整理时会挤进同一批次,撤回时无法分开。整理游标本身按“范围 × 来源”独立(ingest_cursors),
6
+ -- 不同来源(或不同人物的聊天/随笔)之间互不影响,因此只需让批次也带上同样的“整理线”标识。
7
+ --
8
+ -- 数据口径:
9
+ -- lane = '<来源>:<人物ID或*>',如 'chat:zhang-meina'、'audio:*';NULL 表示旧的不分线批次(0145 行为,保持兼容)。
10
+ -- 同一整理线同时只应有一个进行中的批次(由 ingest begin 保证续做,不加唯一约束,避免历史 NULL 行受影响)。
11
+ -- 只新增可空列与注释,不改写已有数据。
12
+ SELECT pg_advisory_xact_lock(hashtext('relation-vault:write'));
13
+
14
+ ALTER TABLE public.vault_batches ADD COLUMN IF NOT EXISTS lane text
15
+ CHECK (lane IS NULL OR lane ~ '^(chat|audio|journal|orders|payments):[a-z0-9*][a-z0-9-]*$');
16
+ COMMENT ON COLUMN public.vault_batches.lane IS
17
+ '整理线(仅 ingest 批次):<来源>:<人物ID或*>,如 chat:zhang-meina、audio:*;同一整理线同时只有一个进行中的批次,不同整理线可由多个 Agent 并行;NULL 为不分线的旧批次';
18
+ CREATE INDEX IF NOT EXISTS ix_vault_batches_open_lane ON public.vault_batches (lane)
19
+ WHERE kind = 'ingest' AND finished_at IS NULL AND undone_by IS NULL;
@@ -0,0 +1,233 @@
1
+ -- 仅 PostgreSQL:账户归属第一期——结构与回填(2026-11-06 账户归属方案)。
2
+ --
3
+ -- 业务背景:
4
+ -- 事实表 payments / orders 与 bank_cards 原本没有“这是谁的”列,账户身份只存在 settings.owner.*,
5
+ -- 每个来源只能存一个值,库里放不下第二个人的账户。本迁移补上归属列和“平台账户绑定”表,
6
+ -- 并把现有数据一次性回填为“我”(persons.is_self = 1);视图、导入器、前端本迁移都不动。
7
+ --
8
+ -- 数据口径:
9
+ -- * 归属 = 付款/下单/持卡账户的主人(不是受益人;受益人仍由 beneficiaries 表达)。
10
+ -- * payments / orders / bank_cards 的 person_id 本期保持可空:现有导入器和手工建卡还不提供它,
11
+ -- 用临时触发器在 NULL 时补“我”;第二期导入器改完后由收紧迁移删触发器并设 NOT NULL。
12
+ -- * bank_card_id 为 NULL 的银行流水按 (source_kind, account_key/card_key) 分组建“草稿卡”并回填,
13
+ -- 这样每笔银行流水都能经 bank_cards.person_id 得到持卡人(收紧迁移再把 bank_card_id 设为 NOT NULL)。
14
+ -- * 旧 settings.owner.* 转成 account_bindings 后原值保留不删(owner.wechat 属聊天,不动、不转)。
15
+ -- * ext_takeout/voucher/parcel_orders 经 (order_platform, order_no) 外键挂在 orders 上,
16
+ -- ext_parking_orders 经 (payment_platform, payment_txn_id) 挂在 payments 上,归属随主表,不单独加列。
17
+ --
18
+ -- 迁移不创建任何备份;正式迁移前由用户自行手动备份并先在隔离库 dry-run。
19
+ SELECT pg_advisory_xact_lock(hashtext('relation-vault:write'));
20
+
21
+ -- 当前“我”:persons.is_self = 1 且未软删除的唯一一行;没有或不唯一时返回 NULL,由调用方决定是否报错。
22
+ CREATE FUNCTION vault_self_person_id() RETURNS text LANGUAGE sql STABLE AS $$
23
+ SELECT CASE WHEN count(*) = 1 THEN min(id) END FROM persons WHERE is_self = 1 AND deleted_at IS NULL
24
+ $$;
25
+
26
+ -- 来源前缀 → 银行名,口径与 vault_match_bank_card(0116)一致,草稿卡沿用同一套命名以便后续模糊匹配兜底。
27
+ CREATE FUNCTION vault_bank_name_of_source(src text) RETURNS text LANGUAGE sql IMMUTABLE AS $$
28
+ SELECT CASE split_part(src, '_', 1)
29
+ WHEN 'citic' THEN '中信银行' WHEN 'cmb' THEN '招商银行' WHEN 'bocom' THEN '交通银行'
30
+ WHEN 'psbc' THEN '邮储银行' WHEN 'tailong' THEN '浙江泰隆商业银行' WHEN 'ccb' THEN '建设银行'
31
+ WHEN 'icbc' THEN '工商银行' WHEN 'boc' THEN '中国银行' WHEN 'jsb' THEN '江苏银行'
32
+ WHEN 'cmbc' THEN '民生银行' WHEN 'hzbank' THEN '杭州银行' END
33
+ $$;
34
+
35
+ -- ① 前置检查:只要有需要回填的数据,“我”必须恰好一条,否则整个迁移失败并给出明确原因。
36
+ -- 全新空库(没有任何资金类数据)不要求已存在“我”,种子人物在迁移之后才创建。
37
+ DO $$
38
+ DECLARE needs_self boolean; self_count integer;
39
+ BEGIN
40
+ needs_self := EXISTS (SELECT 1 FROM payments) OR EXISTS (SELECT 1 FROM orders)
41
+ OR EXISTS (SELECT 1 FROM bank_cards) OR EXISTS (SELECT 1 FROM bank_card_transactions)
42
+ OR EXISTS (SELECT 1 FROM bank_card_statements) OR EXISTS (SELECT 1 FROM credit_card_transactions)
43
+ OR EXISTS (SELECT 1 FROM credit_card_statements)
44
+ OR EXISTS (SELECT 1 FROM settings WHERE "key" LIKE 'owner.%' AND "key" <> 'owner.wechat');
45
+ SELECT count(*) INTO self_count FROM persons WHERE is_self = 1 AND deleted_at IS NULL;
46
+ IF needs_self AND self_count <> 1 THEN
47
+ RAISE EXCEPTION '账户归属迁移需要恰好一个本人(persons.is_self = 1 且未删除),当前为 % 个;请先修正人物档案再迁移', self_count;
48
+ END IF;
49
+ END $$;
50
+
51
+ -- ② 平台账户绑定表:取代 settings.owner.*,仅用于导入时核对“这份文件的账户属于谁”,统计读各行上的 person_id。
52
+ CREATE TABLE account_bindings (
53
+ id text PRIMARY KEY,
54
+ -- 来源类型,与导入器 owner.kind 对应(alipay、wechatpay、cmb_debit_card……)。
55
+ kind text NOT NULL CHECK (length(kind) > 0),
56
+ -- 账户标识:支付宝账户串、微信昵称,银行类为账单上的户名。
57
+ account_key text NOT NULL CHECK (length(account_key) > 0),
58
+ person_id text NOT NULL REFERENCES persons(id),
59
+ -- 标识是否稳定。微信支付昵称可改,为 0;为 0 时每次导入都必须显式指定归属人。
60
+ identity_stable smallint NOT NULL DEFAULT 1 CHECK (identity_stable IN (0, 1)),
61
+ -- 迁移时旧库有流水却没有 owner.* 值,只能用占位账户串登记,pending = 1;下次导入真实账户时提示补全。
62
+ pending smallint NOT NULL DEFAULT 0 CHECK (pending IN (0, 1)),
63
+ -- 创建它的导入批次(与导入同事务写入);迁移或手工登记为空。
64
+ first_batch_id text,
65
+ created_at text NOT NULL,
66
+ created_by text NOT NULL,
67
+ updated_at text NOT NULL,
68
+ updated_by text NOT NULL,
69
+ deleted_at text
70
+ );
71
+ CREATE UNIQUE INDEX ux_account_bindings_active ON account_bindings (kind, account_key) WHERE deleted_at IS NULL;
72
+ CREATE INDEX ix_account_bindings_person ON account_bindings (person_id);
73
+ COMMENT ON TABLE account_bindings IS '平台账户绑定:导入核对用,(kind, account_key) → 归属人;统计不读本表,读各事实行的 person_id';
74
+
75
+ -- ③ 新增归属列。外键先 NOT VALID 再 VALIDATE(回填之后),避免长时间持锁。
76
+ ALTER TABLE bank_cards ADD COLUMN person_id text;
77
+ ALTER TABLE bank_cards ADD COLUMN source_kind text;
78
+ ALTER TABLE bank_cards ADD COLUMN account_key text;
79
+ ALTER TABLE bank_cards ADD COLUMN profile_state text NOT NULL DEFAULT 'complete' CHECK (profile_state IN ('complete', 'draft'));
80
+ ALTER TABLE payments ADD COLUMN person_id text;
81
+ ALTER TABLE orders ADD COLUMN person_id text;
82
+ ALTER TABLE bank_cards ADD CONSTRAINT fk_bank_cards_person FOREIGN KEY (person_id) REFERENCES persons (id) NOT VALID;
83
+ ALTER TABLE payments ADD CONSTRAINT fk_payments_person FOREIGN KEY (person_id) REFERENCES persons (id) NOT VALID;
84
+ ALTER TABLE orders ADD CONSTRAINT fk_orders_person FOREIGN KEY (person_id) REFERENCES persons (id) NOT VALID;
85
+ -- (source_kind, account_key) 是流水与卡片的精确关联键:借记卡取 account_key,信用卡取 card_key。
86
+ -- 加 source_kind 是因为不同银行的键没有全局唯一保证;两列都为空表示手工建的档案暂无流水。
87
+ ALTER TABLE bank_cards ADD CONSTRAINT bank_cards_account_key_pair CHECK ((source_kind IS NULL) = (account_key IS NULL));
88
+ CREATE UNIQUE INDEX ux_bank_cards_account_key ON bank_cards (source_kind, account_key) WHERE deleted_at IS NULL AND account_key IS NOT NULL;
89
+ CREATE INDEX ix_bank_cards_person ON bank_cards (person_id);
90
+ CREATE INDEX ix_payments_person ON payments (person_id);
91
+ CREATE INDEX ix_orders_person ON orders (person_id);
92
+ COMMENT ON COLUMN bank_cards.person_id IS '持卡人(归属人)';
93
+ COMMENT ON COLUMN bank_cards.source_kind IS '与 account_key 配对的来源类型(如 cmb_debit_card)';
94
+ COMMENT ON COLUMN bank_cards.account_key IS '导入关联键:借记卡 account_key 或信用卡 card_key;手工档案暂无流水时为空';
95
+ COMMENT ON COLUMN bank_cards.profile_state IS 'complete = 档案完整;draft = 导入自动建的草稿卡,card_number 只是脱敏占位,等待用户补全';
96
+ COMMENT ON COLUMN payments.person_id IS '付款账户的归属人(谁掏的钱);受益人见 beneficiaries';
97
+ COMMENT ON COLUMN orders.person_id IS '下单账户的归属人;统计消费归属时优先取已确认支付关联的付款流水归属';
98
+
99
+ -- ④ 临时触发器:现有导入器和手工建卡还不提供 person_id,缺省时补“我”。
100
+ -- 第二期收紧迁移会删除它们并设 NOT NULL,之后缺归属一律报错、不再默认写我。
101
+ CREATE FUNCTION vault_default_owner_self() RETURNS trigger LANGUAGE plpgsql AS $$
102
+ BEGIN
103
+ IF NEW.person_id IS NULL THEN NEW.person_id := vault_self_person_id(); END IF;
104
+ RETURN NEW;
105
+ END $$;
106
+ CREATE TRIGGER trg_payments_owner_default BEFORE INSERT ON payments FOR EACH ROW EXECUTE FUNCTION vault_default_owner_self();
107
+ CREATE TRIGGER trg_orders_owner_default BEFORE INSERT ON orders FOR EACH ROW EXECUTE FUNCTION vault_default_owner_self();
108
+ CREATE TRIGGER trg_bank_cards_owner_default BEFORE INSERT ON bank_cards FOR EACH ROW EXECUTE FUNCTION vault_default_owner_self();
109
+
110
+ -- ⑤ 回填:所有现有资金事实归属“我”(Q5:不留“未绑定”状态)。
111
+ UPDATE bank_cards SET person_id = vault_self_person_id() WHERE person_id IS NULL;
112
+ UPDATE payments SET person_id = vault_self_person_id() WHERE person_id IS NULL;
113
+ UPDATE orders SET person_id = vault_self_person_id() WHERE person_id IS NULL;
114
+
115
+ -- ⑥ 银行流水补齐 bank_card_id。
116
+ -- (a) 汇总四张表里出现过的 (来源, 键, 卡片):借记取 account_key,信用取 card_key。
117
+ CREATE TEMP TABLE vault_card_keys ON COMMIT DROP AS
118
+ SELECT source_kind, account_key AS card_key, bank_card_id, account_masked AS masked, card_last_four AS last_four FROM bank_card_transactions
119
+ UNION ALL SELECT source_kind, account_key, bank_card_id, account_masked, right(account_masked, 4) FROM bank_card_statements
120
+ UNION ALL SELECT source_kind, card_key, bank_card_id, NULL, card_last_four FROM credit_card_transactions
121
+ UNION ALL SELECT source_kind, card_key, bank_card_id, NULL, card_last_four FROM credit_card_statements;
122
+
123
+ -- (b) 已被模糊匹配关联到某张手工卡、且该键只对应一张卡的,把键记到卡上(一张卡只记一个键,其余键仍靠已有 bank_card_id)。
124
+ UPDATE bank_cards c SET source_kind = k.source_kind, account_key = k.card_key
125
+ FROM (
126
+ SELECT DISTINCT ON (bank_card_id) source_kind, card_key, bank_card_id
127
+ FROM vault_card_keys k
128
+ WHERE bank_card_id IS NOT NULL
129
+ AND (SELECT count(DISTINCT x.bank_card_id) FROM vault_card_keys x
130
+ WHERE x.source_kind = k.source_kind AND x.card_key = k.card_key AND x.bank_card_id IS NOT NULL) = 1
131
+ ORDER BY bank_card_id, source_kind, card_key
132
+ ) k
133
+ WHERE c.id = k.bank_card_id AND c.account_key IS NULL AND c.deleted_at IS NULL
134
+ AND NOT EXISTS (SELECT 1 FROM bank_cards o WHERE o.source_kind = k.source_kind AND o.account_key = k.card_key AND o.deleted_at IS NULL);
135
+
136
+ -- (c) 仍为 NULL 且键没有对应卡片的分组:为每组建一张归属为“我”的草稿卡。
137
+ -- card_number 只是脱敏占位(NOT NULL 约束仍保留,见方案未决细节 1);借记卡取该组最新一条流水的脱敏号。
138
+ INSERT INTO bank_cards (id, bank_name, card_type, card_number, has_annual_fee, note, created_at, created_by, updated_at, updated_by,
139
+ person_id, source_kind, account_key, profile_state)
140
+ SELECT 'card-draft-' || md5(g.source_kind || ':' || g.card_key),
141
+ coalesce(vault_bank_name_of_source(g.source_kind), '未知银行'),
142
+ CASE WHEN g.source_kind LIKE '%\_credit\_card' THEN 'credit' ELSE 'debit' END,
143
+ coalesce(nullif(regexp_replace(coalesce(g.masked, ''), '\s', '', 'g'), ''), '****' || g.last_four),
144
+ CASE WHEN g.source_kind LIKE '%\_credit\_card' THEN 1 ELSE 0 END,
145
+ '导入自动建立的草稿卡,待补全卡号等档案信息',
146
+ vault_now_text(), 'migration', vault_now_text(), 'migration',
147
+ vault_self_person_id(), g.source_kind, g.card_key, 'draft'
148
+ FROM (
149
+ SELECT source_kind, card_key, max(masked) AS masked, max(last_four) AS last_four
150
+ FROM vault_card_keys k
151
+ WHERE bank_card_id IS NULL
152
+ AND NOT EXISTS (SELECT 1 FROM bank_cards c WHERE c.source_kind = k.source_kind AND c.account_key = k.card_key AND c.deleted_at IS NULL)
153
+ GROUP BY source_kind, card_key
154
+ ) g;
155
+
156
+ -- (d) 回填 bank_card_id(信用卡必须先回填账单头:link 触发器会让带 statement_key 的流水取账单头的卡片):先按精确键,剩余仍 NULL 的(已被软删除卡占用键等极端情形)会在下面的校验里直接报错。
157
+ UPDATE bank_card_transactions t SET bank_card_id = c.id FROM bank_cards c
158
+ WHERE t.bank_card_id IS NULL AND c.deleted_at IS NULL AND c.source_kind = t.source_kind AND c.account_key = t.account_key;
159
+ UPDATE bank_card_statements t SET bank_card_id = c.id FROM bank_cards c
160
+ WHERE t.bank_card_id IS NULL AND c.deleted_at IS NULL AND c.source_kind = t.source_kind AND c.account_key = t.account_key;
161
+ UPDATE credit_card_statements t SET bank_card_id = c.id FROM bank_cards c
162
+ WHERE t.bank_card_id IS NULL AND c.deleted_at IS NULL AND c.source_kind = t.source_kind AND c.account_key = t.card_key;
163
+ UPDATE credit_card_transactions t SET bank_card_id = c.id FROM bank_cards c
164
+ WHERE t.bank_card_id IS NULL AND c.deleted_at IS NULL AND c.source_kind = t.source_kind AND c.account_key = t.card_key;
165
+
166
+ -- (e) 原件关联与解析快照里的 bank_card_id 同步补齐(有卡则填,仍无法确定的保持 NULL,它们不参与统计)。
167
+ UPDATE bank_card_document_links l SET bank_card_id = c.id FROM bank_cards c
168
+ WHERE l.bank_card_id IS NULL AND l.account_key <> '' AND c.deleted_at IS NULL AND c.source_kind = l.source_kind AND c.account_key = l.account_key;
169
+ UPDATE bank_document_records r SET bank_card_id = t.bank_card_id FROM bank_card_transactions t
170
+ WHERE r.bank_card_id IS NULL AND r.bank_transaction_key = t.transaction_key;
171
+ UPDATE bank_document_records r SET bank_card_id = t.bank_card_id FROM bank_card_statements t
172
+ WHERE r.bank_card_id IS NULL AND r.bank_statement_key = t.statement_key;
173
+ UPDATE bank_document_records r SET bank_card_id = t.bank_card_id FROM credit_card_transactions t
174
+ WHERE r.bank_card_id IS NULL AND r.credit_transaction_key = t.transaction_key;
175
+ UPDATE bank_document_records r SET bank_card_id = t.bank_card_id FROM credit_card_statements t
176
+ WHERE r.bank_card_id IS NULL AND r.credit_statement_key = t.statement_key;
177
+
178
+ DO $$
179
+ DECLARE n bigint;
180
+ BEGIN
181
+ SELECT (SELECT count(*) FROM bank_card_transactions WHERE bank_card_id IS NULL)
182
+ + (SELECT count(*) FROM credit_card_transactions WHERE bank_card_id IS NULL) INTO n;
183
+ IF n > 0 THEN
184
+ RAISE EXCEPTION '仍有 % 笔银行流水无法关联到卡片,迁移回滚;请核对 bank_cards 中是否有占用同一键的已删除卡', n;
185
+ END IF;
186
+ END $$;
187
+
188
+ -- ⑦ 旧 settings.owner.* → account_bindings(原值保留不删,代码今后不再读取)。
189
+ -- owner.wechat 属聊天归属,Q20/Q24 约定不动、不转。
190
+ INSERT INTO account_bindings (id, kind, account_key, person_id, identity_stable, pending, created_at, created_by, updated_at, updated_by)
191
+ SELECT 'binding-' || md5(substr(s."key", 7) || ':' || (s.value_json::jsonb ->> 'account')),
192
+ substr(s."key", 7), s.value_json::jsonb ->> 'account', vault_self_person_id(),
193
+ CASE WHEN s."key" = 'owner.wechatpay' THEN 0 ELSE 1 END, 0,
194
+ vault_now_text(), 'migration', vault_now_text(), 'migration'
195
+ FROM settings s
196
+ WHERE s."key" LIKE 'owner.%' AND s."key" <> 'owner.wechat'
197
+ AND coalesce(s.value_json::jsonb ->> 'account', '') <> '';
198
+
199
+ -- 有支付流水却没有 owner.* 值的支付类来源(绑定前就导入过):登记占位账户串并标记待补。
200
+ INSERT INTO account_bindings (id, kind, account_key, person_id, identity_stable, pending, created_at, created_by, updated_at, updated_by)
201
+ SELECT 'binding-pending-' || p.platform, p.platform, '(待补)', vault_self_person_id(),
202
+ CASE WHEN p.platform = 'wechatpay' THEN 0 ELSE 1 END, 1,
203
+ vault_now_text(), 'migration', vault_now_text(), 'migration'
204
+ FROM (SELECT DISTINCT platform FROM payments) p
205
+ WHERE NOT EXISTS (SELECT 1 FROM account_bindings b WHERE b.kind = p.platform AND b.deleted_at IS NULL);
206
+
207
+ -- ⑧ 校验外键与回填结果。
208
+ ALTER TABLE bank_cards VALIDATE CONSTRAINT fk_bank_cards_person;
209
+ ALTER TABLE payments VALIDATE CONSTRAINT fk_payments_person;
210
+ ALTER TABLE orders VALIDATE CONSTRAINT fk_orders_person;
211
+ DO $$
212
+ BEGIN
213
+ IF EXISTS (SELECT 1 FROM payments WHERE person_id IS NULL)
214
+ OR EXISTS (SELECT 1 FROM orders WHERE person_id IS NULL)
215
+ OR EXISTS (SELECT 1 FROM bank_cards WHERE person_id IS NULL) THEN
216
+ RAISE EXCEPTION '账户归属回填后仍有 person_id 为空的行';
217
+ END IF;
218
+ END $$;
219
+
220
+ -- ⑨ 保护、审计、版本与授权:绑定表只允许导入/迁移会话写入(改绑走 importer 会话,不放宽守卫规则)。
221
+ CREATE TRIGGER trg_account_bindings_guard BEFORE INSERT OR UPDATE OR DELETE ON account_bindings FOR EACH ROW EXECUTE FUNCTION vault_guard('fact');
222
+ CREATE TRIGGER trg_account_bindings_truncate BEFORE TRUNCATE ON account_bindings FOR EACH STATEMENT EXECUTE FUNCTION vault_guard('fact');
223
+ CREATE TRIGGER trg_account_bindings_audit AFTER INSERT OR UPDATE OR DELETE ON account_bindings FOR EACH ROW EXECUTE FUNCTION vault_audit('id');
224
+ CREATE TRIGGER trg_account_bindings_version AFTER INSERT OR UPDATE OR DELETE ON account_bindings FOR EACH STATEMENT EXECUTE FUNCTION vault_touch();
225
+ DO $$ DECLARE g record; BEGIN
226
+ REVOKE ALL ON account_bindings FROM PUBLIC;
227
+ FOR g IN SELECT DISTINCT grantee, privilege_type FROM information_schema.role_table_grants
228
+ WHERE table_schema = 'public' AND table_name = 'persons' AND grantee <> current_user
229
+ AND privilege_type IN ('SELECT', 'INSERT', 'UPDATE') LOOP
230
+ EXECUTE format('GRANT %s ON account_bindings TO %s', g.privilege_type,
231
+ CASE WHEN g.grantee = 'PUBLIC' THEN 'PUBLIC' ELSE quote_ident(g.grantee) END);
232
+ END LOOP;
233
+ END $$;
@@ -0,0 +1,24 @@
1
+ -- 仅 PostgreSQL:账户归属第二期——银行流水按账户键精确关联卡片(Q17)。
2
+ --
3
+ -- 业务背景:0116 的 vault_link_bank_card() 只靠银行名、卡类型、末四位、脱敏号正则和哈希指纹做模糊匹配,
4
+ -- 必须唯一命中才赋值,中信借记、招行信用、交行信用等没有完整卡号的账户常匹配不上,bank_card_id 为空。
5
+ -- 0149 起 bank_cards 带 (source_kind, account_key) 精确关联键,导入器写流水前保证每个账户键都有卡片(缺则建草稿卡)。
6
+ -- 本迁移让触发器先按键精确关联,找不到再回退到原模糊匹配,保持对历史手工卡的兼容。
7
+ SELECT pg_advisory_xact_lock(hashtext('relation-vault:write'));
8
+
9
+ CREATE OR REPLACE FUNCTION vault_link_bank_card() RETURNS trigger LANGUAGE plpgsql AS $$
10
+ DECLARE r jsonb; identity_key text; masked text; tail text;
11
+ BEGIN
12
+ IF TG_TABLE_NAME='credit_card_transactions' AND NEW.statement_key IS NOT NULL THEN
13
+ SELECT s.source_kind,s.card_key,s.bank_card_id INTO NEW.source_kind,NEW.card_key,NEW.bank_card_id FROM credit_card_statements s WHERE s.statement_key=NEW.statement_key;
14
+ END IF;
15
+ r:=to_jsonb(NEW); identity_key:=coalesce(r->>'account_key',r->>'card_key');
16
+ masked:=r->>'account_masked'; tail:=coalesce(r->>'card_last_four',right(masked,4));
17
+ IF NEW.bank_card_id IS NULL THEN
18
+ -- 精确键优先:(来源, 账户键) 在未删除卡片中唯一。
19
+ SELECT c.id INTO NEW.bank_card_id FROM bank_cards c
20
+ WHERE c.source_kind=NEW.source_kind AND c.account_key=identity_key AND c.deleted_at IS NULL;
21
+ END IF;
22
+ IF NEW.bank_card_id IS NULL THEN NEW.bank_card_id:=vault_match_bank_card(NEW.source_kind,identity_key,masked,tail); END IF;
23
+ RETURN NEW;
24
+ END $$;