Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(auto): recover corrupt projections without rejecting message writes

Dash9ec7b2a19bbc
diff --git a/apps/desktop/drizzle/scripts/0117_auto_review_projections.ts b/apps/desktop/drizzle/scripts/0117_auto_review_projections.ts
index 763dddd9f6..eb83cb6309 100644
--- a/apps/desktop/drizzle/scripts/0117_auto_review_projections.ts
+++ b/apps/desktop/drizzle/scripts/0117_auto_review_projections.ts
@@ -21,7 +21,7 @@ WHEN NEW.role IN ('user', 'ask_user', 'plan_review')
coalesce(json_extract(NEW.agent_meta, '$.autoReviewUserText.kind') IN ('scheduled-continuation','delegated-continuation'),0) ELSE 0 END)
BEGIN
UPDATE auto_review_projections SET revision = revision + 1,
- payload = json_set(coalesce(payload,'{}'), '$.appendEvent', json_object(
+ payload = json_set(CASE WHEN json_valid(payload) THEN payload ELSE '{}' END, '$.appendEvent', json_object(
'sessionId', NEW.session_id, 'clientId', NEW.client_id, 'role', NEW.role,
'content', NEW.content, 'createdAt', NEW.created_at, 'agentMeta', NEW.agent_meta,
'visible', NEW.rewind_at IS NULL AND (SELECT cleared_at IS NULL OR NEW.created_at > cleared_at FROM sessions WHERE id=NEW.session_id)))
@@ -30,7 +30,7 @@ END;
CREATE TRIGGER auto_review_message_delete AFTER DELETE ON messages
WHEN OLD.role IN ('user', 'ask_user', 'plan_review')
BEGIN
- UPDATE auto_review_projections SET revision = revision + 1, payload = json_remove(payload,'$.appendEvent')
+ UPDATE auto_review_projections SET revision = revision + 1, payload = CASE WHEN json_valid(payload) THEN json_remove(payload,'$.appendEvent') ELSE NULL END
WHERE session_id = OLD.session_id OR lead_id = OLD.session_id;
END;
CREATE TRIGGER auto_review_message_update AFTER UPDATE OF session_id, role, content, agent_meta, created_at, rewind_at ON messages
@@ -40,13 +40,13 @@ WHEN (OLD.role IN ('user', 'ask_user', 'plan_review') OR NEW.role IN ('user', 'a
IS NOT (CASE WHEN json_valid(NEW.agent_meta) THEN json_array(json_extract(NEW.agent_meta,'$.autoReviewUserText'),json_extract(NEW.agent_meta,'$.delivery'),json_extract(NEW.agent_meta,'$.autoResume'),json_extract(NEW.agent_meta,'$.contextRebuild')) ELSE NULL END)
OR OLD.created_at IS NOT NEW.created_at OR OLD.rewind_at IS NOT NEW.rewind_at)
BEGIN
- UPDATE auto_review_projections SET revision = revision + 1, payload = json_remove(payload,'$.appendEvent')
+ UPDATE auto_review_projections SET revision = revision + 1, payload = CASE WHEN json_valid(payload) THEN json_remove(payload,'$.appendEvent') ELSE NULL END
WHERE session_id IN (OLD.session_id, NEW.session_id) OR lead_id IN (OLD.session_id, NEW.session_id);
END;
CREATE TRIGGER auto_review_session_clear AFTER UPDATE OF cleared_at ON sessions
WHEN OLD.cleared_at IS NOT NEW.cleared_at
BEGIN
- UPDATE auto_review_projections SET revision = revision + 1, payload = json_remove(payload,'$.appendEvent')
+ UPDATE auto_review_projections SET revision = revision + 1, payload = CASE WHEN json_valid(payload) THEN json_remove(payload,'$.appendEvent') ELSE NULL END
WHERE session_id = NEW.id OR lead_id = NEW.id;
END;
`);
diff --git a/apps/desktop/src/main/localDb/__tests__/autoReviewProjection.test.ts b/apps/desktop/src/main/localDb/__tests__/autoReviewProjection.test.ts
index 63a85cb150..ca899d7481 100644
--- a/apps/desktop/src/main/localDb/__tests__/autoReviewProjection.test.ts
+++ b/apps/desktop/src/main/localDb/__tests__/autoReviewProjection.test.ts
@@ -68,6 +68,41 @@ function stored(db: Database.Database) {
}
describe('durable Auto authority projection', () => {
+ it.each(['insert', 'answer', 'delete', 'clear', 'rewind'])(
+ 'keeps %s writes and rebuilds evidence after corrupt summaries with live and legacy connections',
+ (operation) => {
+ for (const live of [true, false]) {
+ const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'cindy-corrupt-projection-'));
+ directories.push(dir);
+ const filename = path.join(dir, 'test.sqlite');
+ const db = open(filename);
+ add(db, 'grant', 'worker', 1, 'allow');
+ add(db, 'restriction', 'worker', 2, 'deny');
+ add(db, 'answer', 'worker', 0, 'question', 'ask_user', {});
+ read(db);
+ db.prepare("UPDATE auto_review_projections SET payload='{broken'").run();
+ const writer = live ? db : open(filename, false);
+ expect(() => {
+ writer.transaction(() => {
+ if (operation === 'insert') add(writer, 'latest', 'worker', 4, 'never publish');
+ if (operation === 'answer') writer.prepare('UPDATE messages SET agent_meta=? WHERE id=?').run(
+ JSON.stringify({autoReviewUserText:{text:'never publish',acceptedAt:4}}), 'answer');
+ if (operation === 'delete') writer.prepare("DELETE FROM messages WHERE id='grant'").run();
+ if (operation === 'clear') writer.prepare("UPDATE sessions SET cleared_at=1 WHERE id='worker'").run();
+ if (operation === 'rewind') writer.prepare("UPDATE messages SET rewind_at=4 WHERE id='grant'").run();
+ })();
+ }).not.toThrow();
+ if (!live) expect(stored(writer).revision).not.toBe(stored(writer).projected_revision);
+ const restored = read(writer);
+ expect(JSON.stringify(restored.sessionIntent)).toContain('deny');
+ if (operation === 'insert' || operation === 'answer')
+ expect(JSON.stringify(restored.sessionIntent)).toContain('never publish');
+ else expect(JSON.stringify(restored.sessionIntent)).not.toContain('allow');
+ expect(stored(writer).revision).toBe(stored(writer).projected_revision);
+ }
+ },
+ );
+
it.each(['lead', 'worker'])('keeps literal trigger restrictions and rejects ambiguous provenance in %s', session => {
const dir=fs.mkdtempSync(path.join(os.tmpdir(),'cindy-authority-literal-'));
directories.push(dir);const filename=path.join(dir,'test.sqlite');const db=open(filename);
diff --git a/apps/desktop/src/main/localDb/autoReviewProjection.ts b/apps/desktop/src/main/localDb/autoReviewProjection.ts
index 2d0a6f36cc..f91f5c18dc 100644
--- a/apps/desktop/src/main/localDb/autoReviewProjection.ts
+++ b/apps/desktop/src/main/localDb/autoReviewProjection.ts
@@ -122,7 +122,7 @@ export function readAutoReviewProjection(
UPDATE auto_review_projections SET payload = cindy_authority_projection_v1(CASE WHEN OLD.projected_revision = OLD.revision AND OLD.version = 3
AND json_extract(NEW.payload, '$.appendEvent.role') = 'user'
AND json_extract(NEW.payload, '$.appendEvent.visible') = 1
- AND json_extract(NEW.payload, '$.appendEvent.createdAt') > json_extract(OLD.payload, '$.lastEventAt')
+ AND json_extract(NEW.payload, '$.appendEvent.createdAt') > (CASE WHEN json_valid(OLD.payload) THEN json_extract(OLD.payload, '$.lastEventAt') ELSE NULL END)
THEN NULL ELSE (
SELECT json_group_array(json_object('sessionId', session_id, 'clientId', client_id,
'role', role, 'content', content, 'createdAt', created_at, 'agentMeta', agent_meta))
@@ -158,7 +158,7 @@ export function readAutoReviewProjection(
// inside this transaction. Never fall back to the previous payload.
if (row.version !== 3 || row.projected_revision !== row.revision || row.payload === null) {
db.prepare(
- "UPDATE auto_review_projections SET revision = revision + 1, payload = json_remove(payload, '$.appendEvent') WHERE session_id = ? AND lead_id = ?",
+ "UPDATE auto_review_projections SET revision = revision + 1, payload = CASE WHEN json_valid(payload) THEN json_remove(payload, '$.appendEvent') ELSE NULL END WHERE session_id = ? AND lead_id = ?",
).run(sessionId, leadId);
row = select.get(sessionId, leadId) as Row;
}
@@ -227,7 +227,7 @@ export function batchAutoReviewProjection<T>(
.depth === 0
) {
db.prepare(
- "UPDATE auto_review_projections SET revision=revision, payload=json_remove(payload,'$.appendEvent') WHERE projected_revision != revision",
+ "UPDATE auto_review_projections SET revision=revision, payload=CASE WHEN json_valid(payload) THEN json_remove(payload,'$.appendEvent') ELSE NULL END WHERE projected_revision != revision",
).run();
}
return result;
diff --git a/apps/desktop/src/renderer/__tests__/voiceInputEditorEditability.test.ts b/apps/desktop/src/renderer/__tests__/voiceInputEditorEditability.test.ts
index 0f0237f438..a564d972ba 100644
--- a/apps/desktop/src/renderer/__tests__/voiceInputEditorEditability.test.ts
+++ b/apps/desktop/src/renderer/__tests__/voiceInputEditorEditability.test.ts
@@ -26,7 +26,8 @@ describe('ChatInput voice lifecycle locks', () => {
const extraDirsBlock = chatInputSource.slice(extraDirsStart, permissionStart);
expect(extraDirsBlock).toContain('disabled={composerMutationLocked}');
- const permissionEnd = chatInputSource.indexOf('/>', permissionStart);
+ // Inline footer elements can close before the outer permission selector.
+ const permissionEnd = permissionStart + chatInputSource.slice(permissionStart).search(/\n\s*\/>/);
expect(permissionEnd).toBeGreaterThan(permissionStart);
const permissionBlock = chatInputSource.slice(permissionStart, permissionEnd);
expect(permissionBlock).toContain('disabled={composerEditorLocked || settingsLocked || sharedGuest}');