@simonepri/refined-antigravity-acp 1.3.1 → 1.4.0

package/dist/src/fixes/orphaned-checkpoints/index.d.ts

@@ -12,18 +12,28 @@
 import { type AcpFix } from "../../core/types.js";
 export declare const STEP_TYPE_USER = 14;
 export declare const STEP_TYPE_AGENT = 15;
+export declare const STEP_TYPE_ERROR = 17;
 export declare const STEP_TYPE_CHECKPOINT = 23;
 export declare const CHECKPOINT_STATUS_IN_PROGRESS = 2;
 export declare const CHECKPOINT_STATUS_ABORTED = 5;
 export declare const DONE_CH_PANIC_MARKER = "could not find doneCh for checkpoint";
 export declare function getConversationDbPath(sessionId: string): string;
+export declare function extractExecutorMetadataStepIdx(data: Uint8Array): number | null;
+export declare function extractGenMetadataStepIndices(data: Uint8Array): {
+    stepIdx: number | null;
+    earliestIdx: number | null;
+};
 /**
  * Automatically repairs orphaned in-progress steps (status=2), including checkpoints
  * (step_type=23) and action/tool steps (step_type=21), left behind by cancelled, aborted,
  * or interrupted Antigravity turns. Setting status=5 (aborted) prevents Antigravity
  * from crashing on resumption or next prompt with "could not find doneCh for checkpoint".
  *
- * Returns the number of repaired steps.
+ * Also prunes orphaned or out-of-bounds `executor_metadata` and `gen_metadata` entries
+ * whose step indices exceed the maximum valid step in `steps`, preventing fatal Go executor
+ * panics ("earliest step index is out of bounds: X vs Y").
+ *
+ * Returns the number of repaired steps and metadata records.
  */
 export declare function repairOrphanedCheckpoints(sessionId: string, customDbPath?: string): number;
 export declare const orphanedCheckpointsFix: AcpFix;

package/dist/src/fixes/orphaned-checkpoints/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/fixes/orphaned-checkpoints/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAMH,OAAO,EAGL,KAAK,MAAM,EAEZ,MAAM,qBAAqB,CAAC;AAG7B,eAAO,MAAM,cAAc,KAAK,CAAC;AACjC,eAAO,MAAM,eAAe,KAAK,CAAC;AAClC,eAAO,MAAM,oBAAoB,KAAK,CAAC;AAEvC,eAAO,MAAM,6BAA6B,IAAI,CAAC;AAC/C,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAE3C,eAAO,MAAM,oBAAoB,yCAAyC,CAAC;AAE3E,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAG/D;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAmC1F;AAED,eAAO,MAAM,sBAAsB,EAAE,MAcpC,CAAC;AAEF,eAAO,MAAM,mBAAmB,QAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/fixes/orphaned-checkpoints/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAMH,OAAO,EAGL,KAAK,MAAM,EAEZ,MAAM,qBAAqB,CAAC;AAI7B,eAAO,MAAM,cAAc,KAAK,CAAC;AACjC,eAAO,MAAM,eAAe,KAAK,CAAC;AAClC,eAAO,MAAM,eAAe,KAAK,CAAC;AAClC,eAAO,MAAM,oBAAoB,KAAK,CAAC;AAEvC,eAAO,MAAM,6BAA6B,IAAI,CAAC;AAC/C,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAE3C,eAAO,MAAM,oBAAoB,yCAAyC,CAAC;AAE3E,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAG/D;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAsB9E;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,UAAU,GAAG;IAC/D,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,CAuBA;AA8DD;;;;;;;;;;;GAWG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAsC1F;AAED,eAAO,MAAM,sBAAsB,EAAE,MAiBpC,CAAC;AAEF,eAAO,MAAM,mBAAmB,QAAyB,CAAC"}

package/dist/src/fixes/orphaned-checkpoints/index.js

@@ -15,8 +15,10 @@ import { join } from "node:path";
 import { DatabaseSync } from "node:sqlite";
 import { ACP_METHODS, } from "../../core/types.js";
 import { extractSessionId } from "../../core/session-cache.js";
+import { decodeVarint, getField } from "../../lib/protobuf.js";
 export const STEP_TYPE_USER = 14;
 export const STEP_TYPE_AGENT = 15;
+export const STEP_TYPE_ERROR = 17;
 export const STEP_TYPE_CHECKPOINT = 23;
 export const CHECKPOINT_STATUS_IN_PROGRESS = 2;
 export const CHECKPOINT_STATUS_ABORTED = 5;
@@ -25,13 +27,120 @@ export function getConversationDbPath(sessionId) {
     const geminiHome = process.env.GEMINI_HOME || join(homedir(), ".gemini");
     return join(geminiHome, "antigravity-acp", "conversations", `${sessionId}.db`);
 }
+export function extractExecutorMetadataStepIdx(data) {
+    let offset = 0;
+    while (offset < data.length) {
+        const [tag, nextOffset] = decodeVarint(data, offset);
+        const fieldNum = tag >> 3;
+        const wireType = tag & 7;
+        if (wireType === 0) {
+            const [v, after] = decodeVarint(data, nextOffset);
+            if (fieldNum === 3)
+                return v;
+            offset = after;
+        }
+        else if (wireType === 2) {
+            const [len, afterLen] = decodeVarint(data, nextOffset);
+            offset = afterLen + len;
+        }
+        else if (wireType === 1) {
+            offset = nextOffset + 8;
+        }
+        else if (wireType === 5) {
+            offset = nextOffset + 4;
+        }
+        else {
+            break;
+        }
+    }
+    return null;
+}
+export function extractGenMetadataStepIndices(data) {
+    let stepIdx = null;
+    let earliestIdx = null;
+    const f2 = getField(data, 2);
+    if (f2 && f2.length >= 2) {
+        const [v1] = decodeVarint(f2, 0);
+        stepIdx = v1;
+    }
+    const f1 = getField(data, 1);
+    if (f1) {
+        const f9 = getField(f1, 9);
+        if (f9 && f9.length >= 2) {
+            const [tag, off] = decodeVarint(f9, 0);
+            if (tag >> 3 === 1) {
+                const [val] = decodeVarint(f9, off);
+                earliestIdx = val;
+            }
+        }
+    }
+    return { stepIdx, earliestIdx };
+}
+function repairStepCheckpoints(db) {
+    const stmt = db.prepare(`
+    UPDATE steps
+    SET status = ${CHECKPOINT_STATUS_ABORTED},
+        step_payload = CASE
+          WHEN length(step_payload) >= 4 AND substr(step_payload, 3, 2) = x'2002'
+          THEN CAST(substr(step_payload, 1, 3) || x'05' || substr(step_payload, 5) AS BLOB)
+          ELSE step_payload
+        END
+    WHERE status = ${CHECKPOINT_STATUS_IN_PROGRESS} OR (length(step_payload) >= 4 AND substr(step_payload, 3, 2) = x'2002');
+  `);
+    return Number(stmt.run().changes);
+}
+function pruneExecutorMetadata(db, maxStepIdx) {
+    const hasTable = db
+        .prepare("SELECT name FROM sqlite_master WHERE type = 'table' AND name = 'executor_metadata'")
+        .get();
+    if (!hasTable)
+        return 0;
+    let pruned = 0;
+    const rows = db
+        .prepare("SELECT idx, data FROM executor_metadata ORDER BY idx DESC")
+        .all();
+    for (const row of rows) {
+        if (!row.data)
+            continue;
+        const step = extractExecutorMetadataStepIdx(row.data);
+        if (step !== null && step > maxStepIdx) {
+            db.prepare("DELETE FROM executor_metadata WHERE idx = ?").run(row.idx);
+            pruned++;
+        }
+    }
+    return pruned;
+}
+function pruneGenMetadata(db, maxStepIdx) {
+    const hasTable = db
+        .prepare("SELECT name FROM sqlite_master WHERE type = 'table' AND name = 'gen_metadata'")
+        .get();
+    if (!hasTable)
+        return 0;
+    let pruned = 0;
+    const rows = db.prepare("SELECT idx, data FROM gen_metadata ORDER BY idx DESC").all();
+    for (const row of rows) {
+        if (!row.data)
+            continue;
+        const { stepIdx, earliestIdx } = extractGenMetadataStepIndices(row.data);
+        if ((stepIdx !== null && stepIdx > maxStepIdx) ||
+            (earliestIdx !== null && earliestIdx > maxStepIdx)) {
+            db.prepare("DELETE FROM gen_metadata WHERE idx = ?").run(row.idx);
+            pruned++;
+        }
+    }
+    return pruned;
+}
 /**
  * Automatically repairs orphaned in-progress steps (status=2), including checkpoints
  * (step_type=23) and action/tool steps (step_type=21), left behind by cancelled, aborted,
  * or interrupted Antigravity turns. Setting status=5 (aborted) prevents Antigravity
  * from crashing on resumption or next prompt with "could not find doneCh for checkpoint".
  *
- * Returns the number of repaired steps.
+ * Also prunes orphaned or out-of-bounds `executor_metadata` and `gen_metadata` entries
+ * whose step indices exceed the maximum valid step in `steps`, preventing fatal Go executor
+ * panics ("earliest step index is out of bounds: X vs Y").
+ *
+ * Returns the number of repaired steps and metadata records.
  */
 export function repairOrphanedCheckpoints(sessionId, customDbPath) {
     const dbPath = customDbPath ?? getConversationDbPath(sessionId);
@@ -40,20 +149,21 @@ export function repairOrphanedCheckpoints(sessionId, customDbPath) {
     let db = null;
     try {
         db = new DatabaseSync(dbPath, { timeout: 2000 });
-        const stmt = db.prepare(`
-      UPDATE steps
-      SET status = ${CHECKPOINT_STATUS_ABORTED},
-          step_payload = CASE
-            WHEN length(step_payload) >= 4 AND substr(step_payload, 3, 2) = x'2002'
-            THEN CAST(substr(step_payload, 1, 3) || x'05' || substr(step_payload, 5) AS BLOB)
-            ELSE step_payload
-          END
-      WHERE status = ${CHECKPOINT_STATUS_IN_PROGRESS} OR (length(step_payload) >= 4 AND substr(step_payload, 3, 2) = x'2002');
-    `);
-        const result = stmt.run();
-        const repairedCount = Number(result.changes);
+        let repairedCount = repairStepCheckpoints(db);
+        const maxRow = db
+            .prepare(`SELECT max(idx) as m FROM steps WHERE step_type != ${STEP_TYPE_ERROR}`)
+            .get();
+        const maxStepIdx = maxRow?.m ?? null;
+        if (maxStepIdx !== null) {
+            const cleanErrorSteps = db
+                .prepare(`DELETE FROM steps WHERE idx > ? AND step_type = ${STEP_TYPE_ERROR}`)
+                .run(maxStepIdx);
+            repairedCount += Number(cleanErrorSteps.changes);
+            repairedCount += pruneExecutorMetadata(db, maxStepIdx);
+            repairedCount += pruneGenMetadata(db, maxStepIdx);
+        }
         if (repairedCount > 0) {
-            console.error(`[refined-antigravity-acp] Repaired ${repairedCount} orphaned checkpoint/step(s) for session ${sessionId}`);
+            console.error(`[refined-antigravity-acp] Repaired ${repairedCount} orphaned checkpoint/step/metadata record(s) for session ${sessionId}`);
         }
         return repairedCount;
     }
@@ -69,7 +179,8 @@ export const orphanedCheckpointsFix = {
     name: "orphaned-checkpoints",
     description: "Repairs orphaned in-progress SQLite checkpoints to prevent fatal doneCh panics on resumption",
     onOutbound(msg, _context) {
-        if ("method" in msg && msg.method === ACP_METHODS.SESSION_LOAD) {
+        if ("method" in msg &&
+            (msg.method === ACP_METHODS.SESSION_LOAD || msg.method === ACP_METHODS.SESSION_PROMPT)) {
             const sessionId = extractSessionId(msg);
             if (sessionId) {
                 repairOrphanedCheckpoints(sessionId);

package/dist/src/fixes/orphaned-checkpoints/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/fixes/orphaned-checkpoints/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EACL,WAAW,GAIZ,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,CAAC,MAAM,cAAc,GAAG,EAAE,CAAC;AACjC,MAAM,CAAC,MAAM,eAAe,GAAG,EAAE,CAAC;AAClC,MAAM,CAAC,MAAM,oBAAoB,GAAG,EAAE,CAAC;AAEvC,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,CAAC;AAC/C,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,CAAC;AAE3C,MAAM,CAAC,MAAM,oBAAoB,GAAG,sCAAsC,CAAC;AAE3E,MAAM,UAAU,qBAAqB,CAAC,SAAiB;IACrD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,CAAC;IACzE,OAAO,IAAI,CAAC,UAAU,EAAE,iBAAiB,EAAE,eAAe,EAAE,GAAG,SAAS,KAAK,CAAC,CAAC;AACjF,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,yBAAyB,CAAC,SAAiB,EAAE,YAAqB;IAChF,MAAM,MAAM,GAAG,YAAY,IAAI,qBAAqB,CAAC,SAAS,CAAC,CAAC;IAChE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;QAAE,OAAO,CAAC,CAAC;IAElC,IAAI,EAAE,GAAwB,IAAI,CAAC;IACnC,IAAI,CAAC;QACH,EAAE,GAAG,IAAI,YAAY,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QACjD,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC;;qBAEP,yBAAyB;;;;;;uBAMvB,6BAA6B;KAC/C,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC1B,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAE7C,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;YACtB,OAAO,CAAC,KAAK,CACX,sCAAsC,aAAa,4CAA4C,SAAS,EAAE,CAC3G,CAAC;QACJ,CAAC;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CACX,sEAAsE,SAAS,GAAG,EAClF,GAAG,CACJ,CAAC;QACF,OAAO,CAAC,CAAC;IACX,CAAC;YAAS,CAAC;QACT,EAAE,EAAE,KAAK,EAAE,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAW;IAC5C,IAAI,EAAE,sBAAsB;IAC5B,WAAW,EACT,8FAA8F;IAEhG,UAAU,CAAC,GAAqB,EAAE,QAAyB;QACzD,IAAI,QAAQ,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,WAAW,CAAC,YAAY,EAAE,CAAC;YAC/D,MAAM,SAAS,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;YACxC,IAAI,SAAS,EAAE,CAAC;gBACd,yBAAyB,CAAC,SAAS,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,sBAAsB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/fixes/orphaned-checkpoints/index.ts"],"names":[],"mappings":"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"}

package/dist/src/fixes/silent-background-tasks/index.d.ts

@@ -22,18 +22,43 @@ export interface PlanEntry {
 }
 export declare function createPlanUpdateMessage(sessionId: string, entries: PlanEntry[]): AcpStreamMessage;
 export interface SubagentInfo {
+    id?: string | undefined;
     role?: string | undefined;
     prompt?: string | undefined;
     typeName?: string | undefined;
+    conversationId?: string | undefined;
 }
+export interface TrackedSubagentInfo extends SubagentInfo {
+    content: string;
+    status: "pending" | "in_progress" | "completed";
+}
+export interface SubagentStatusReport {
+    role?: string | undefined;
+    type?: string | undefined;
+    conversationId?: string | undefined;
+    state?: string | undefined;
+}
+export declare function isSubagentCompletedState(state?: string): boolean;
 export declare function parseSubagentsFromArgs(rawArgs: unknown): SubagentInfo[];
+export declare function parseSubagentStatusReports(rawOutput: unknown): SubagentStatusReport[];
+export declare function detectCompletedSubagentsInText(text: string, trackedSubagents: TrackedSubagentInfo[]): TrackedSubagentInfo[];
 export declare function formatSubagentContent(info: SubagentInfo): string;
+export interface BackgroundTaskInfo {
+    desc: string;
+    taskId?: string | undefined;
+}
+export declare function detectLaunchedTasksInText(text: string): BackgroundTaskInfo[];
+export declare function reconstructPlanFromSteps(steps: readonly unknown[]): PlanEntry[];
 export declare class BackgroundTasksTracker {
     private readonly sessions;
     private readonly promptIdToSessionId;
     private getOrCreate;
     getEntries(sessionId: string): readonly PlanEntry[];
+    hasActiveTasksOrSubagents(sessionId: string): boolean;
+    setPendingPlan(sessionId: string, entries: PlanEntry[]): void;
+    flushPendingPlan(sessionId: string): AcpStreamMessage | null;
     onPromptStart(sessionId: string, promptId?: string | number | undefined): void;
+    recordTaskId(sessionId: string, taskId: string, content: string): void;
     getSessionForPromptId(promptId: string | number): string | undefined;
     isWaitingForTasks(sessionId: string): boolean;
     setWaiting(sessionId: string, waiting: boolean): void;
@@ -41,6 +66,9 @@ export declare class BackgroundTasksTracker {
     getToolCommand(sessionId: string, toolCallId: string): string | undefined;
     deferPromptResponse(sessionId: string, response: AcpStreamMessage): void;
     recordSubagents(sessionId: string, subagents: SubagentInfo[], toolCallId?: string): PlanEntry[];
+    updateFromManageSubagents(sessionId: string, rawOutput: unknown): PlanEntry[] | null;
+    updateFromText(sessionId: string, text: string): PlanEntry[] | null;
+    updateFromManageTask(sessionId: string, rawOutput: unknown): PlanEntry[] | null;
     recordCustomTask(sessionId: string, content: string, priority?: "high" | "medium" | "low", toolCallId?: string): PlanEntry[];
     onWaitingForTasks(sessionId: string): AcpStreamMessage | null;
     onRunning(sessionId: string): AcpStreamMessage | null;
@@ -54,6 +82,8 @@ export declare class BackgroundTasksTracker {
 }
 export declare function inferToolName(name?: string | null, title?: string | null, rawInput?: unknown): string | null;
 export declare function formatScheduleTask(rawArgs: unknown): string;
+export declare function extractBackgroundTaskInfo(rawOutput: unknown, _toolCallId?: string | undefined, storedCommand?: string | undefined): BackgroundTaskInfo | null;
+export declare function extractBackgroundTaskDescription(rawOutput: unknown, toolCallId?: string | undefined, storedCommand?: string | undefined): string | null;
 export declare function createSilentBackgroundTasksFix(_options?: BackgroundTasksOptions | undefined): AcpFix & {
     tracker: BackgroundTasksTracker;
 };

package/dist/src/fixes/silent-background-tasks/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/fixes/silent-background-tasks/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/fixes/silent-background-tasks/index.ts"],"names":[],"mappings":"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"}