linkshell-cli 0.10.34 → 0.10.35

package/dist/host/src/drivers/acp/antigravity.js

@@ -1,5 +1,6 @@
 import { execFile } from "node:child_process";
-import { accessSync, constants, existsSync, mkdirSync, readdirSync, readFileSync, statSync } from "node:fs";
+import { randomBytes } from "node:crypto";
+import { accessSync, constants, existsSync, mkdirSync, readdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
 import { basename, delimiter, dirname, isAbsolute, join } from "node:path";
 import { DatabaseSync } from "node:sqlite";
@@ -249,6 +250,16 @@ export function antigravitySpec() {
         authStatus: antigravityAuthStatus,
     };
 }
+const ANTIGRAVITY_DESKTOP_COMMANDS = [
+    { name: "goal", description: "设定持续目标，让 Antigravity 持续推进直到完成", hint: "<目标描述>" },
+    { name: "plan", description: "先制定分步执行计划，再动手实现", hint: "<任务描述>" },
+    { name: "boost", description: "深度思考、多视角分析与严格验证模式", hint: "<复杂问题或任务>" },
+    { name: "teamwork-preview", description: "启动多 Agent 协作团队共同完成大型项目", hint: "<项目任务>" },
+    { name: "grill-me", description: "通过互动提问对齐方案细节与设计决策", hint: "<主题>" },
+    { name: "compact", description: "压缩并总结当前对话上下文以释放窗口空间" },
+    { name: "schedule", description: "创建定时任务或后台周期自动化", hint: "<定时指令>" },
+    { name: "learn", description: "总结并持久化当前经验与约定供后续会话使用" },
+];
 function unquoteArg(value) {
     if (typeof value !== "string")
         return value;
@@ -277,13 +288,110 @@ function parseToolArgs(raw) {
     }
     return result;
 }
+function stripTruncationMarkers(text) {
+    return text.replace(/\n?\.\.\.\s*<truncated\s+\d+\s+bytes>\s*\.\.\.\n?/gi, "\n").replace(/<truncated\s+\d+\s+bytes>/gi, "");
+}
 export function cleanAntigravityUserInput(content) {
-    const requestMatch = /<USER_REQUEST>\s*([\s\S]*?)\s*<\/USER_REQUEST>/i.exec(content);
-    if (requestMatch)
-        return requestMatch[1].trim();
-    return content
-        .replace(/<(?:ADDITIONAL_METADATA|USER_SETTINGS_CHANGE|SYSTEM_MESSAGE|CONTEXT_SUMMARY)>[\s\S]*?<\/(?:ADDITIONAL_METADATA|USER_SETTINGS_CHANGE|SYSTEM_MESSAGE|CONTEXT_SUMMARY)>/gi, "")
+    const closedMatch = /<USER_REQUEST>\s*([\s\S]*?)\s*<\/USER_REQUEST>/i.exec(content);
+    if (closedMatch)
+        return stripTruncationMarkers(closedMatch[1]).trim();
+    const openMatch = /<USER_REQUEST>\s*([\s\S]*?)(?:<(?:ADDITIONAL_METADATA|USER_SETTINGS_CHANGE|SYSTEM_MESSAGE|CONTEXT_SUMMARY|EPILOGUE|GOAL_MODE|PLAN|TEAMWORK|BOOST)>|$)/i.exec(content);
+    if (openMatch)
+        return stripTruncationMarkers(openMatch[1]).trim();
+    return stripTruncationMarkers(content.replace(/<(?:ADDITIONAL_METADATA|USER_SETTINGS_CHANGE|SYSTEM_MESSAGE|CONTEXT_SUMMARY|EPILOGUE|GOAL_MODE|PLAN|TEAMWORK|BOOST|GOAL)>[\s\S]*?<\/(?:ADDITIONAL_METADATA|USER_SETTINGS_CHANGE|SYSTEM_MESSAGE|CONTEXT_SUMMARY|EPILOGUE|GOAL_MODE|PLAN|TEAMWORK|BOOST|GOAL)>/gi, ""))
+        .replace(/<!--\s*GOAL_(?:COMPLETE|CANCELLED)\s*-->/gi, "")
+        .trim();
+}
+export function cleanAntigravityAgentContent(content) {
+    const goalComplete = /<!--\s*GOAL_COMPLETE\s*-->/i.test(content);
+    const goalCancelled = /<!--\s*GOAL_CANCELLED\s*-->/i.test(content);
+    const text = stripTruncationMarkers(content)
+        .replace(/<!--\s*GOAL_(?:COMPLETE|CANCELLED)\s*-->/gi, "")
+        .replace(/<(?:SYSTEM_MESSAGE|EPILOGUE|GOAL_MODE|ADDITIONAL_METADATA|USER_SETTINGS_CHANGE)>[\s\S]*?<\/(?:SYSTEM_MESSAGE|EPILOGUE|GOAL_MODE|ADDITIONAL_METADATA|USER_SETTINGS_CHANGE)>/gi, "")
         .trim();
+    return { text, goalComplete, goalCancelled };
+}
+function extractModelSelectionFromContent(content) {
+    if (!content)
+        return undefined;
+    const regex = /changed setting `Model Selection` from .*? to ([^\r\n.<]+?)\.?\s*(?:<\/USER_SETTINGS_CHANGE>|\r|\n|$)/gi;
+    let last;
+    let match;
+    while ((match = regex.exec(content)) !== null) {
+        if (match[1]?.trim())
+            last = match[1].trim();
+    }
+    return last;
+}
+function parseGoalDurationSeconds(raw) {
+    if (!raw)
+        return undefined;
+    let total = 0;
+    let matched = false;
+    const hours = /(\d+)\s*h/i.exec(raw);
+    const mins = /(\d+)\s*m/i.exec(raw);
+    const secs = /(\d+)\s*s/i.exec(raw);
+    if (hours?.[1]) {
+        total += Number(hours[1]) * 3600;
+        matched = true;
+    }
+    if (mins?.[1]) {
+        total += Number(mins[1]) * 60;
+        matched = true;
+    }
+    if (secs?.[1]) {
+        total += Number(secs[1]);
+        matched = true;
+    }
+    return matched ? total : undefined;
+}
+function parseGoalSystemMessage(content, previousGoal) {
+    if (!content || !/Stop hook blocked termination:\s*You are still working toward the user's goal/i.test(content)) {
+        return undefined;
+    }
+    const iterMatch = /Continuation:\s*#(\d+)/i.exec(content);
+    const timeMatch = /Time spent so far:\s*([^\r\n]+)/i.exec(content);
+    const origMatch = /Original request:\s*([\s\S]*?)(?:<\/SYSTEM_MESSAGE>|$)/i.exec(content);
+    const rawObjective = origMatch?.[1]?.trim().replace(/^\/goal(?:\s+|$)/i, "").trim();
+    const objective = rawObjective || previousGoal?.objective || "持续目标";
+    const iterations = iterMatch?.[1] ? Number(iterMatch[1]) : previousGoal?.iterations;
+    const timeUsedSeconds = parseGoalDurationSeconds(timeMatch?.[1]) ?? previousGoal?.timeUsedSeconds;
+    return {
+        objective,
+        status: "active",
+        ...(iterations !== undefined ? { iterations } : {}),
+        ...(timeUsedSeconds !== undefined ? { timeUsedSeconds } : {}),
+    };
+}
+function readStepMediaBlocks(media) {
+    if (!Array.isArray(media) || media.length === 0)
+        return [];
+    const blocks = [];
+    for (const entry of media) {
+        const mimeType = entry.mime_type || entry.mimeType || "image/png";
+        const inline = entry.inline_data || entry.inlineData;
+        if (typeof inline === "string" && inline.length > 0) {
+            blocks.push({ type: "image", mimeType, data: inline });
+            continue;
+        }
+        const rawUri = entry.uri;
+        if (typeof rawUri === "string" && rawUri.length > 0) {
+            const filePath = rawUri.startsWith("file://") ? fileURLToPath(rawUri) : rawUri;
+            try {
+                if (existsSync(filePath)) {
+                    const stat = statSync(filePath);
+                    if (stat.isFile() && stat.size > 0 && stat.size <= 15 * 1024 * 1024) {
+                        const data = readFileSync(filePath).toString("base64");
+                        blocks.push({ type: "image", mimeType, data });
+                    }
+                }
+            }
+            catch {
+                // ignore unreadable media file
+            }
+        }
+    }
+    return blocks;
 }
 function mapAntigravityToolCall(stepIndex, callIndex, call, outputText) {
     const name = call.name ?? "tool";
@@ -328,6 +436,7 @@ function mapAntigravityToolCall(stepIndex, callIndex, call, outputText) {
         kind = "fetch";
         rawInput = { url: typeof args.Url === "string" ? args.Url : summary };
     }
+    const cleanedOutput = outputText ? stripTruncationMarkers(outputText) : undefined;
     return {
         sessionUpdate: "tool_call",
         toolCallId,
@@ -336,13 +445,14 @@ function mapAntigravityToolCall(stepIndex, callIndex, call, outputText) {
         kind,
         status: "completed",
         rawInput,
-        ...(outputText ? { rawOutput: { output: outputText } } : {}),
+        ...(cleanedOutput ? { rawOutput: { output: cleanedOutput } } : {}),
         ...(locations ? { locations } : {}),
     };
 }
 /**
- * Converts an Antigravity Desktop `transcript.jsonl` file into LinkShell's
- * `HistoryItem[]` list.
+ * Converts an Antigravity Desktop `transcript_full.jsonl` (or `transcript.jsonl`)
+ * file into LinkShell's `HistoryItem[]` list, tracking Goal Mode (`ls_goal`),
+ * model changes (`<USER_SETTINGS_CHANGE>`), and uploaded media.
  */
 export function parseAntigravityTranscript(transcriptPath, fromLine = 0) {
     if (!existsSync(transcriptPath))
@@ -354,8 +464,50 @@ export function parseAntigravityTranscript(transcriptPath, fromLine = 0) {
     catch {
         return { items: [], nextLine: fromLine };
     }
+    let activeGoal = null;
+    let lastModelLabel;
+    // Scan lines prior to `fromLine` so incremental parsing retains active goal & model state.
+    const scanLimit = Math.min(fromLine, lines.length);
+    for (let i = 0; i < scanLimit; i++) {
+        try {
+            const step = JSON.parse(lines[i]);
+            if (step.type === "USER_INPUT" && typeof step.content === "string") {
+                const modelLabel = extractModelSelectionFromContent(step.content);
+                if (modelLabel)
+                    lastModelLabel = modelLabel;
+                const rawText = cleanAntigravityUserInput(step.content);
+                if (/^\/goal\s+(?:clear|stop|off|reset|none|cancel)\s*$/i.test(rawText)) {
+                    activeGoal = null;
+                }
+                else if (/^\/goal(?:\s+|$)/i.test(rawText) || /\/goal is a \[Slash Command\]:/i.test(step.content)) {
+                    const objective = rawText.replace(/^\/goal(?:\s+|$)/i, "").trim() || "持续目标";
+                    activeGoal = { objective, status: "active" };
+                }
+                else if (activeGoal?.status === "complete") {
+                    activeGoal = null;
+                }
+            }
+            else if (step.type === "SYSTEM_MESSAGE") {
+                const nextGoal = parseGoalSystemMessage(step.content, activeGoal);
+                if (nextGoal)
+                    activeGoal = nextGoal;
+            }
+            else if (step.type === "PLANNER_RESPONSE" && typeof step.content === "string") {
+                const { goalComplete, goalCancelled } = cleanAntigravityAgentContent(step.content);
+                if (goalCancelled) {
+                    activeGoal = null;
+                }
+                else if (goalComplete) {
+                    activeGoal = { ...(activeGoal ?? { objective: "持续目标" }), status: "complete" };
+                }
+            }
+        }
+        catch {
+            // ignore malformed historical line
+        }
+    }
     if (fromLine >= lines.length)
-        return { items: [], nextLine: lines.length };
+        return { items: [], nextLine: lines.length, lastModelLabel, goal: activeGoal };
     const parsed = [];
     for (let i = fromLine; i < lines.length; i++) {
         try {
@@ -364,41 +516,88 @@ export function parseAntigravityTranscript(transcriptPath, fromLine = 0) {
         }
         catch {
             // skip partial trailing JSON line
-            return { items: [], nextLine: i };
+            return { items: [], nextLine: i, lastModelLabel, goal: activeGoal };
         }
     }
     const items = [];
     for (let i = 0; i < parsed.length; i++) {
         const { index: stepIndex, step } = parsed[i];
         if (step.type === "USER_INPUT") {
-            const text = typeof step.content === "string" ? cleanAntigravityUserInput(step.content) : "";
-            if (!text)
+            if (typeof step.content === "string") {
+                const modelLabel = extractModelSelectionFromContent(step.content);
+                if (modelLabel)
+                    lastModelLabel = modelLabel;
+            }
+            const rawText = typeof step.content === "string" ? cleanAntigravityUserInput(step.content) : "";
+            const mediaBlocks = readStepMediaBlocks(step.media);
+            let displayText = rawText;
+            let goalUpdate;
+            if (/^\/goal\s+(?:clear|stop|off|reset|none|cancel)\s*$/i.test(rawText)) {
+                activeGoal = null;
+                goalUpdate = { sessionUpdate: "ls_goal", goal: null };
+            }
+            else if (/^\/goal(?:\s+|$)/i.test(rawText) || (typeof step.content === "string" && /\/goal is a \[Slash Command\]:/i.test(step.content))) {
+                const objective = rawText.replace(/^\/goal(?:\s+|$)/i, "").trim() || "持续目标";
+                displayText = objective;
+                activeGoal = { objective, status: "active" };
+                goalUpdate = { sessionUpdate: "ls_goal", goal: activeGoal };
+            }
+            else if (activeGoal?.status === "complete") {
+                activeGoal = null;
+                goalUpdate = { sessionUpdate: "ls_goal", goal: null };
+            }
+            if (!displayText && mediaBlocks.length === 0 && !goalUpdate)
                 continue;
             const messageId = `agy:user:${stepIndex}`;
+            const updates = [];
+            for (const mediaBlock of mediaBlocks) {
+                updates.push({
+                    sessionUpdate: "user_message_chunk",
+                    messageId,
+                    content: mediaBlock,
+                });
+            }
+            if (displayText) {
+                updates.push({
+                    sessionUpdate: "user_message_chunk",
+                    messageId,
+                    content: { type: "text", text: displayText },
+                });
+            }
+            if (goalUpdate) {
+                updates.push(goalUpdate);
+            }
             items.push({
                 itemId: messageId,
-                updates: [
-                    {
-                        sessionUpdate: "user_message_chunk",
-                        messageId,
-                        content: { type: "text", text },
-                    },
-                ],
+                updates,
             });
         }
+        else if (step.type === "SYSTEM_MESSAGE") {
+            const nextGoal = parseGoalSystemMessage(step.content, activeGoal);
+            if (nextGoal) {
+                activeGoal = nextGoal;
+                items.push({
+                    itemId: `agy:goal:${stepIndex}`,
+                    updates: [{ sessionUpdate: "ls_goal", goal: activeGoal }],
+                });
+            }
+        }
         else if (step.type === "PLANNER_RESPONSE") {
             const updates = [];
-            if (typeof step.thinking === "string" && step.thinking.trim()) {
-                const thoughtId = `agy:thought:${stepIndex}`;
-                updates.push({
-                    sessionUpdate: "agent_thought_chunk",
-                    messageId: thoughtId,
-                    content: { type: "text", text: step.thinking.trim() },
-                }, {
-                    sessionUpdate: "ls_message_done",
-                    messageId: thoughtId,
-                    role: "thought",
-                });
+            if (typeof step.thinking === "string") {
+                const cleanThought = stripTruncationMarkers(step.thinking).trim();
+                if (cleanThought) {
+                    const thoughtId = `agy:thought:${stepIndex}`;
+                    updates.push({
+                        sessionUpdate: "agent_thought_chunk",
+                        messageId: thoughtId,
+                        content: { type: "text", text: cleanThought },
+                    }, {
+                        sessionUpdate: "ls_message_done",
+                        messageId: thoughtId,
+                        role: "thought",
+                    });
+                }
             }
             const calls = Array.isArray(step.tool_calls) ? step.tool_calls : [];
             if (calls.length > 0) {
@@ -414,16 +613,27 @@ export function parseAntigravityTranscript(transcriptPath, fromLine = 0) {
                 });
             }
             if (typeof step.content === "string" && step.content.trim()) {
-                const messageId = `agy:msg:${stepIndex}`;
-                updates.push({
-                    sessionUpdate: "agent_message_chunk",
-                    messageId,
-                    content: { type: "text", text: step.content.trim() },
-                }, {
-                    sessionUpdate: "ls_message_done",
-                    messageId,
-                    role: "agent",
-                });
+                const { text: cleanText, goalComplete, goalCancelled } = cleanAntigravityAgentContent(step.content);
+                if (cleanText) {
+                    const messageId = `agy:msg:${stepIndex}`;
+                    updates.push({
+                        sessionUpdate: "agent_message_chunk",
+                        messageId,
+                        content: { type: "text", text: cleanText },
+                    }, {
+                        sessionUpdate: "ls_message_done",
+                        messageId,
+                        role: "agent",
+                    });
+                }
+                if (goalCancelled) {
+                    activeGoal = null;
+                    updates.push({ sessionUpdate: "ls_goal", goal: null });
+                }
+                else if (goalComplete) {
+                    activeGoal = { ...(activeGoal ?? { objective: "持续目标" }), status: "complete" };
+                    updates.push({ sessionUpdate: "ls_goal", goal: activeGoal });
+                }
             }
             if (updates.length > 0) {
                 items.push({
@@ -433,7 +643,7 @@ export function parseAntigravityTranscript(transcriptPath, fromLine = 0) {
             }
         }
     }
-    return { items, nextLine: lines.length };
+    return { items, nextLine: lines.length, lastModelLabel, goal: activeGoal };
 }
 async function findRunningLanguageServer(desktop) {
     if (!desktop?.logPath || !existsSync(desktop.logPath))
@@ -500,13 +710,30 @@ function parseWorkspaceCwd(workspaceUrisJson, fallbackCwd) {
     }
     return fallbackCwd;
 }
+function resolveDesktopTranscriptPath(dataDir, nativeId) {
+    const logsDir = join(dataDir, "brain", nativeId, ".system_generated", "logs");
+    const fullPath = join(logsDir, "transcript_full.jsonl");
+    if (existsSync(fullPath))
+        return fullPath;
+    return join(logsDir, "transcript.jsonl");
+}
+function extForMimeType(mimeType) {
+    const sub = mimeType.split("/")[1]?.toLowerCase() ?? "png";
+    if (sub === "jpeg" || sub === "jpg")
+        return "jpg";
+    if (sub === "webp")
+        return "webp";
+    if (sub === "gif")
+        return "gif";
+    return "png";
+}
 /**
  * Specialized driver for Google Antigravity:
  * - Drives `agy_acp_server.par` / `agy-acp` over ACP when installed.
  * - Also discovers and interacts with Antigravity Desktop (`/Applications/Antigravity.app`,
- *   `~/.gemini/antigravity/conversation_summaries.db`, `brain/<id>/.system_generated/logs/transcript.jsonl`,
+ *   `~/.gemini/antigravity/conversation_summaries.db`, `brain/<id>/.system_generated/logs/transcript_full.jsonl`,
  *   and its local `language_server` Connect-RPC service) so users with only the Desktop app
- *   get full session visibility, history, model selection, and messaging.
+ *   get full session visibility, history, Goal Mode, image messaging, and model selection.
  */
 export class AntigravityDriver extends AcpDriver {
     desktopMode = false;
@@ -514,6 +741,7 @@ export class AntigravityDriver extends AcpDriver {
     desktopSessionStates = new Map();
     desktopWatchers = new Map();
     desktopModelsCache;
+    desktopDefaultModel;
     constructor(options) {
         super(antigravitySpec(), options);
     }
@@ -577,6 +805,12 @@ export class AntigravityDriver extends AcpDriver {
                         const prev = this.desktopSessionStates.get(s.nativeId);
                         this.desktopSessionStates.set(s.nativeId, nextState);
                         if (prev !== undefined && prev !== nextState) {
+                            if (nextState === "running") {
+                                this.host?.update(this.id, s.nativeId, { sessionUpdate: "ls_turn", state: "started" });
+                            }
+                            else {
+                                this.host?.update(this.id, s.nativeId, { sessionUpdate: "ls_turn", state: "ended", stopReason: "end_turn" });
+                            }
                             this.host?.update(this.id, s.nativeId, {
                                 sessionUpdate: "ls_status",
                                 state: nextState,
@@ -605,7 +839,26 @@ export class AntigravityDriver extends AcpDriver {
         const desktop = resolveAntigravityDesktop(this.options.env ?? process.env);
         if (!desktop)
             return undefined;
-        return join(desktop.dataDir, "brain", nativeId, ".system_generated", "logs", "transcript.jsonl");
+        return resolveDesktopTranscriptPath(desktop.dataDir, nativeId);
+    }
+    desktopAliasesFor(nativeId) {
+        try {
+            const raw = this.host?.state(this.id, nativeId).get("agy-desktop-aliases");
+            if (!raw)
+                return new Map();
+            return new Map(JSON.parse(raw));
+        }
+        catch {
+            return new Map();
+        }
+    }
+    saveDesktopAliases(nativeId, aliases) {
+        try {
+            this.host?.state(this.id, nativeId).set("agy-desktop-aliases", JSON.stringify([...aliases]));
+        }
+        catch {
+            // ignore state write errors
+        }
     }
     isConversationRunningInDesktop(nativeId, statusCol) {
         const desktop = resolveAntigravityDesktop(this.options.env ?? process.env);
@@ -665,11 +918,13 @@ export class AntigravityDriver extends AcpDriver {
                     const cwd = parseWorkspaceCwd(row.workspace_uris, home);
                     const updatedAt = Date.parse(row.last_modified_time) || Date.now();
                     let title = row.title?.trim() || undefined;
-                    if (!title) {
-                        const transcriptPath = join(desktop.dataDir, "brain", row.conversation_id, ".system_generated", "logs", "transcript.jsonl");
-                        const { items } = parseAntigravityTranscript(transcriptPath, 0);
-                        const firstUser = items.find((entry) => entry.updates.some((u) => u.sessionUpdate === "user_message_chunk"));
-                        const chunk = firstUser?.updates.find((u) => u.sessionUpdate === "user_message_chunk");
+                    let model;
+                    const transcriptPath = resolveDesktopTranscriptPath(desktop.dataDir, row.conversation_id);
+                    if (!title && existsSync(transcriptPath)) {
+                        const parsed = parseAntigravityTranscript(transcriptPath, 0);
+                        model = parsed.lastModelLabel;
+                        const firstUser = parsed.items.find((entry) => entry.updates.some((u) => u.sessionUpdate === "user_message_chunk"));
+                        const chunk = firstUser?.updates.find((u) => u.sessionUpdate === "user_message_chunk" && u.content.type === "text");
                         if (chunk?.sessionUpdate === "user_message_chunk" && chunk.content.type === "text") {
                             title = chunk.content.text.split("\n")[0]?.slice(0, 100).trim() || undefined;
                         }
@@ -683,6 +938,7 @@ export class AntigravityDriver extends AcpDriver {
                         nativeId: row.conversation_id,
                         cwd,
                         title,
+                        ...(model ? { model } : {}),
                         createdAt: updatedAt,
                         updatedAt,
                         state,
@@ -705,13 +961,13 @@ export class AntigravityDriver extends AcpDriver {
             try {
                 const dirs = readdirSync(join(desktop.dataDir, "brain"));
                 for (const id of dirs) {
-                    const transcriptPath = join(desktop.dataDir, "brain", id, ".system_generated", "logs", "transcript.jsonl");
+                    const transcriptPath = resolveDesktopTranscriptPath(desktop.dataDir, id);
                     if (!existsSync(transcriptPath))
                         continue;
                     const stat = statSync(transcriptPath);
-                    const { items } = parseAntigravityTranscript(transcriptPath, 0);
-                    const firstUser = items.find((entry) => entry.updates.some((u) => u.sessionUpdate === "user_message_chunk"));
-                    const chunk = firstUser?.updates.find((u) => u.sessionUpdate === "user_message_chunk");
+                    const parsed = parseAntigravityTranscript(transcriptPath, 0);
+                    const firstUser = parsed.items.find((entry) => entry.updates.some((u) => u.sessionUpdate === "user_message_chunk"));
+                    const chunk = firstUser?.updates.find((u) => u.sessionUpdate === "user_message_chunk" && u.content.type === "text");
                     const title = chunk?.sessionUpdate === "user_message_chunk" && chunk.content.type === "text"
                         ? chunk.content.text.split("\n")[0]?.slice(0, 100).trim()
                         : undefined;
@@ -719,6 +975,7 @@ export class AntigravityDriver extends AcpDriver {
                         nativeId: id,
                         cwd: home,
                         title,
+                        ...(parsed.lastModelLabel ? { model: parsed.lastModelLabel } : {}),
                         createdAt: stat.mtimeMs,
                         updatedAt: stat.mtimeMs,
                         state: "idle",
@@ -752,6 +1009,16 @@ export class AntigravityDriver extends AcpDriver {
             return [];
         try {
             const data = await callLanguageServer(conn, "GetCascadeModelConfigData", {});
+            const defaultOverride = data.defaultOverrideModelConfig?.modelOrAlias?.model ??
+                data.defaultOverrideModelConfig?.modelOrAlias?.alias;
+            if (defaultOverride)
+                this.desktopDefaultModel = defaultOverride;
+            const sortOrder = new Map();
+            const sortedLabels = data.clientModelSorts?.[0]?.groups?.flatMap((g) => g.modelLabels ?? []) ?? [];
+            sortedLabels.forEach((label, idx) => {
+                if (!sortOrder.has(label))
+                    sortOrder.set(label, idx);
+            });
             const models = (data.clientModelConfigs ?? [])
                 .map((entry) => {
                 const value = entry.modelOrAlias?.model ?? entry.modelOrAlias?.alias;
@@ -765,6 +1032,13 @@ export class AntigravityDriver extends AcpDriver {
                 };
             })
                 .filter((entry) => Boolean(entry));
+            if (sortOrder.size > 0) {
+                models.sort((a, b) => {
+                    const rankA = sortOrder.get(a.name) ?? 9999;
+                    const rankB = sortOrder.get(b.name) ?? 9999;
+                    return rankA - rankB;
+                });
+            }
             if (models.length > 0)
                 this.desktopModelsCache = models;
             return models;
@@ -773,56 +1047,125 @@ export class AntigravityDriver extends AcpDriver {
             return [];
         }
     }
+    async resolveSessionModel(nativeId, models, explicitModel) {
+        const matchByValueOrName = (candidate) => {
+            if (!candidate)
+                return undefined;
+            return models.find((m) => m.value === candidate || m.name === candidate);
+        };
+        const watcher = this.desktopWatchers.get(nativeId);
+        const persistedSelected = this.host?.state(this.id, nativeId).get("agy-selected-model");
+        const chosen = matchByValueOrName(explicitModel) ??
+            matchByValueOrName(watcher?.selectedModel) ??
+            matchByValueOrName(persistedSelected) ??
+            matchByValueOrName(watcher?.lastModelLabel);
+        if (chosen)
+            return chosen;
+        const desktop = resolveAntigravityDesktop(this.options.env ?? process.env);
+        const conn = await findRunningLanguageServer(desktop);
+        if (conn) {
+            try {
+                const meta = await callLanguageServer(conn, "GetCascadeTrajectoryGeneratorMetadata", { cascadeId: nativeId });
+                const entries = meta.generatorMetadata ?? [];
+                for (let i = entries.length - 1; i >= 0; i--) {
+                    const entry = entries[i];
+                    const candidate = entry.plannerConfig?.requestedModel?.model ??
+                        entry.plannerConfig?.requestedModel?.alias ??
+                        entry.plannerConfig?.planModel ??
+                        entry.chatModel?.model;
+                    const found = matchByValueOrName(candidate);
+                    if (found)
+                        return found;
+                }
+            }
+            catch {
+                // ignore metadata RPC failure
+            }
+        }
+        const fromDefault = matchByValueOrName(this.desktopDefaultModel);
+        if (fromDefault)
+            return fromDefault;
+        if (desktop && existsSync(join(desktop.dataDir, "antigravity_state.pbtxt"))) {
+            try {
+                const stateText = readFileSync(join(desktop.dataDir, "antigravity_state.pbtxt"), "utf8");
+                const match = /last_selected_agent_model:\s*(\S+)/.exec(stateText);
+                const found = matchByValueOrName(match?.[1]);
+                if (found)
+                    return found;
+            }
+            catch {
+                // ignore
+            }
+        }
+        return models[0];
+    }
     async emitDesktopConfig(nativeId, selectedModel) {
+        this.host?.update(this.id, nativeId, {
+            sessionUpdate: "available_commands_update",
+            availableCommands: ANTIGRAVITY_DESKTOP_COMMANDS,
+        });
         const models = await this.loadDesktopModels();
         if (models.length === 0)
             return;
-        let defaultModel = selectedModel;
-        if (!defaultModel) {
-            const desktop = resolveAntigravityDesktop(this.options.env ?? process.env);
-            if (desktop && existsSync(join(desktop.dataDir, "antigravity_state.pbtxt"))) {
-                try {
-                    const stateText = readFileSync(join(desktop.dataDir, "antigravity_state.pbtxt"), "utf8");
-                    const match = /last_selected_agent_model:\s*(\S+)/.exec(stateText);
-                    if (match?.[1] && models.some((m) => m.value === match[1]))
-                        defaultModel = match[1];
-                }
-                catch {
-                    // ignore
-                }
-            }
-        }
-        const current = defaultModel && models.some((m) => m.value === defaultModel) ? defaultModel : models[0].value;
+        const matched = await this.resolveSessionModel(nativeId, models, selectedModel);
         const options = [
             {
                 id: "model",
                 name: "Model",
                 category: "model",
-                current,
+                current: matched.value,
                 values: models,
             },
         ];
         this.host?.update(this.id, nativeId, { sessionUpdate: "ls_config", options });
+        this.host?.update(this.id, nativeId, { sessionUpdate: "session_info_update", model: matched.name });
     }
-    startWatchingDesktopTranscript(nativeId, transcriptPath, initialLine) {
+    startWatchingDesktopTranscript(nativeId, initialLine, initialMeta) {
         const existing = this.desktopWatchers.get(nativeId);
         if (existing)
             clearInterval(existing.timer);
-        const lastSize = existsSync(transcriptPath) ? statSync(transcriptPath).size : 0;
+        const activePath = this.transcriptPathFor(nativeId);
+        const lastSize = activePath && existsSync(activePath) ? statSync(activePath).size : 0;
+        const initialRunning = this.isConversationRunningInDesktop(nativeId);
+        this.desktopSessionStates.set(nativeId, initialRunning ? "running" : "idle");
         const watcher = {
             nextLine: initialLine,
             lastSize,
-            running: this.isConversationRunningInDesktop(nativeId),
-            selectedModel: existing?.selectedModel,
+            running: initialRunning,
+            detached: false,
+            selectedModel: existing?.selectedModel ?? this.host?.state(this.id, nativeId).get("agy-selected-model") ?? undefined,
+            lastModelLabel: initialMeta?.lastModelLabel ?? existing?.lastModelLabel,
+            goal: initialMeta?.goal !== undefined ? initialMeta.goal : existing?.goal,
+            pendingClientMessages: existing?.pendingClientMessages ?? [],
             timer: setInterval(() => {
-                if (existsSync(transcriptPath)) {
+                const currentPath = this.transcriptPathFor(nativeId);
+                if (currentPath && existsSync(currentPath)) {
                     try {
-                        const stat = statSync(transcriptPath);
-                        if (stat.size > watcher.lastSize) {
+                        const stat = statSync(currentPath);
+                        if (stat.size !== watcher.lastSize) {
                             watcher.lastSize = stat.size;
-                            const { items, nextLine } = parseAntigravityTranscript(transcriptPath, watcher.nextLine);
-                            watcher.nextLine = nextLine;
-                            for (const item of items) {
+                            const parsed = parseAntigravityTranscript(currentPath, watcher.nextLine);
+                            watcher.nextLine = parsed.nextLine;
+                            if (parsed.lastModelLabel && parsed.lastModelLabel !== watcher.lastModelLabel) {
+                                watcher.lastModelLabel = parsed.lastModelLabel;
+                                void this.emitDesktopConfig(nativeId);
+                            }
+                            if (parsed.goal !== undefined) {
+                                watcher.goal = parsed.goal;
+                            }
+                            for (const item of parsed.items) {
+                                if (item.itemId.startsWith("agy:user:") && watcher.pendingClientMessages.length > 0) {
+                                    const pending = watcher.pendingClientMessages.shift();
+                                    const aliases = this.desktopAliasesFor(nativeId);
+                                    aliases.set(item.itemId, `local-${pending.clientMessageId}`);
+                                    this.saveDesktopAliases(nativeId, aliases);
+                                    // Emit only non-user_message_chunk updates (such as ls_goal) since the user message was already echoed with local-${clientMessageId}.
+                                    const nonUserUpdates = item.updates.filter((u) => u.sessionUpdate !== "user_message_chunk");
+                                    for (const update of nonUserUpdates) {
+                                        this.host?.update(this.id, nativeId, update);
+                                    }
+                                    continue;
+                                }
                                 item.updates.forEach((update, idx) => {
                                     this.host?.update(this.id, nativeId, update, idx === item.updates.length - 1 ? item.itemId : undefined);
                                 });
@@ -836,6 +1179,7 @@ export class AntigravityDriver extends AcpDriver {
                 const nowRunning = this.isConversationRunningInDesktop(nativeId);
                 if (nowRunning !== watcher.running) {
                     watcher.running = nowRunning;
+                    this.desktopSessionStates.set(nativeId, nowRunning ? "running" : "idle");
                     if (nowRunning) {
                         this.host?.update(this.id, nativeId, { sessionUpdate: "ls_turn", state: "started" });
                         this.host?.update(this.id, nativeId, { sessionUpdate: "ls_status", state: "running", turnActive: true });
@@ -843,23 +1187,41 @@ export class AntigravityDriver extends AcpDriver {
                     else {
                         this.host?.update(this.id, nativeId, { sessionUpdate: "ls_turn", state: "ended", stopReason: "end_turn" });
                         this.host?.update(this.id, nativeId, { sessionUpdate: "ls_status", state: "idle", turnActive: false });
+                        if (watcher.detached) {
+                            clearInterval(watcher.timer);
+                            this.desktopWatchers.delete(nativeId);
+                        }
                     }
                 }
             }, 1500),
         };
         watcher.timer.unref?.();
         this.desktopWatchers.set(nativeId, watcher);
+        return watcher;
     }
     async attach(nativeId, context) {
         const transcriptPath = this.transcriptPathFor(nativeId);
         if (this.desktopMode || (transcriptPath && existsSync(transcriptPath))) {
             await this.ensureStarted();
-            const { items, nextLine } = transcriptPath ? parseAntigravityTranscript(transcriptPath, 0) : { items: [], nextLine: 0 };
-            if (transcriptPath) {
-                this.startWatchingDesktopTranscript(nativeId, transcriptPath, nextLine);
-            }
+            const parsed = transcriptPath ? parseAntigravityTranscript(transcriptPath, 0) : { items: [], nextLine: 0 };
+            const aliases = this.desktopAliasesFor(nativeId);
+            const items = parsed.items.map((item) => {
+                const aliasedId = aliases.get(item.itemId);
+                return aliasedId ? { ...item, itemId: aliasedId } : item;
+            });
+            this.startWatchingDesktopTranscript(nativeId, parsed.nextLine, {
+                lastModelLabel: parsed.lastModelLabel,
+                goal: parsed.goal,
+            });
             const running = this.isConversationRunningInDesktop(nativeId);
+            this.desktopSessionStates.set(nativeId, running ? "running" : "idle");
+            if (!running) {
+                this.host?.update(this.id, nativeId, { sessionUpdate: "ls_turn", state: "ended", stopReason: "end_turn" });
+            }
             this.host?.update(this.id, nativeId, { sessionUpdate: "ls_status", state: running ? "running" : "idle", turnActive: running });
+            if (parsed.goal !== undefined) {
+                this.host?.update(this.id, nativeId, { sessionUpdate: "ls_goal", goal: parsed.goal });
+            }
             void this.emitDesktopConfig(nativeId, this.desktopWatchers.get(nativeId)?.selectedModel);
             return items;
         }
@@ -868,8 +1230,14 @@ export class AntigravityDriver extends AcpDriver {
     async detach(nativeId) {
         const watcher = this.desktopWatchers.get(nativeId);
         if (watcher) {
-            clearInterval(watcher.timer);
-            this.desktopWatchers.delete(nativeId);
+            if (watcher.running) {
+                // Keep watching until the active turn completes so turn end and final messages are recorded.
+                watcher.detached = true;
+            }
+            else {
+                clearInterval(watcher.timer);
+                this.desktopWatchers.delete(nativeId);
+            }
         }
         await super.detach(nativeId);
     }
@@ -890,18 +1258,38 @@ export class AntigravityDriver extends AcpDriver {
         const nativeId = response.cascadeId;
         if (!nativeId)
             throw RpcError.app("agent_unavailable", "Antigravity 未返回新会话 ID");
-        const transcriptPath = this.transcriptPathFor(nativeId);
-        if (transcriptPath)
-            this.startWatchingDesktopTranscript(nativeId, transcriptPath, 0);
+        const watcher = this.startWatchingDesktopTranscript(nativeId, 0);
         if (options.model) {
-            const watcher = this.desktopWatchers.get(nativeId);
-            if (watcher)
-                watcher.selectedModel = options.model;
+            watcher.selectedModel = options.model;
+            this.host?.state(this.id, nativeId).set("agy-selected-model", options.model);
         }
         void this.emitDesktopConfig(nativeId, options.model);
         const now = Date.now();
         return { nativeId, cwd: options.cwd, createdAt: now, updatedAt: now, state: "idle" };
     }
+    async goal(nativeId, change) {
+        if (!this.desktopMode && !this.desktopWatchers.has(nativeId)) {
+            throw RpcError.app("not_supported", "这个 Agent 通过 /goal 命令管理目标");
+        }
+        const watcher = this.desktopWatchers.get(nativeId);
+        if (change.action === "get") {
+            return watcher?.goal ?? null;
+        }
+        if (change.action === "clear") {
+            if (watcher)
+                watcher.goal = null;
+            this.host?.update(this.id, nativeId, { sessionUpdate: "ls_goal", goal: null });
+            return null;
+        }
+        if (change.action === "set") {
+            const nextGoal = { objective: change.objective, status: "active" };
+            if (watcher)
+                watcher.goal = nextGoal;
+            await this.prompt(nativeId, [{ type: "text", text: `/goal ${change.objective}` }], `goal-${Date.now()}`);
+            return nextGoal;
+        }
+        return watcher?.goal ?? null;
+    }
     async prompt(nativeId, content, clientMessageId, context) {
         const transcriptPath = this.transcriptPathFor(nativeId);
         if (!this.desktopMode && !(transcriptPath && existsSync(transcriptPath))) {
@@ -916,21 +1304,96 @@ export class AntigravityDriver extends AcpDriver {
             .map((block) => (block.type === "text" ? block.text : ""))
             .join("\n")
             .trim();
-        if (!text)
+        const imageBlocks = content.filter((block) => block.type === "image");
+        if (!text && imageBlocks.length === 0)
             throw RpcError.app("invalid_params", "nothing to send");
-        const fullText = context ? `${context}\n\n${text}` : text;
-        const selectedModel = this.desktopWatchers.get(nativeId)?.selectedModel;
+        if (/^\/goal\s+(?:clear|stop|off|reset|none|cancel)\s*$/i.test(text) && imageBlocks.length === 0) {
+            const watcher = this.desktopWatchers.get(nativeId);
+            if (watcher)
+                watcher.goal = null;
+            this.host?.update(this.id, nativeId, {
+                sessionUpdate: "user_message_chunk",
+                messageId: `local-${clientMessageId}`,
+                content: { type: "text", text },
+            });
+            this.host?.update(this.id, nativeId, { sessionUpdate: "ls_message_done", messageId: `local-${clientMessageId}`, role: "user" }, `local-${clientMessageId}`);
+            this.host?.update(this.id, nativeId, { sessionUpdate: "ls_goal", goal: null });
+            return "started";
+        }
+        let watcher = this.desktopWatchers.get(nativeId);
+        if (!watcher) {
+            const parsed = transcriptPath ? parseAntigravityTranscript(transcriptPath, 0) : undefined;
+            watcher = this.startWatchingDesktopTranscript(nativeId, parsed?.nextLine ?? 0, parsed);
+        }
+        // Echo user message with `local-${clientMessageId}` so the mobile client's optimistic bubble is confirmed in-place.
+        watcher.pendingClientMessages.push({ clientMessageId, text });
+        const displayBlocks = content.map((block) => {
+            if (block.type === "text" && /^\/goal(?:\s+|$)/i.test(block.text.trim())) {
+                const cleaned = block.text.trim().replace(/^\/goal(?:\s+|$)/i, "").trim() || block.text;
+                return { type: "text", text: cleaned };
+            }
+            return block;
+        });
+        for (const block of displayBlocks) {
+            this.host?.update(this.id, nativeId, {
+                sessionUpdate: "user_message_chunk",
+                messageId: `local-${clientMessageId}`,
+                content: block,
+            });
+        }
+        this.host?.update(this.id, nativeId, { sessionUpdate: "ls_message_done", messageId: `local-${clientMessageId}`, role: "user" }, `local-${clientMessageId}`);
+        if (/^\/goal(?:\s+|$)/i.test(text)) {
+            const objective = text.replace(/^\/goal(?:\s+|$)/i, "").trim() || "持续目标";
+            const nextGoal = { objective, status: "active" };
+            watcher.goal = nextGoal;
+            this.host?.update(this.id, nativeId, { sessionUpdate: "ls_goal", goal: nextGoal });
+        }
+        else if (watcher.goal?.status === "complete") {
+            watcher.goal = null;
+            this.host?.update(this.id, nativeId, { sessionUpdate: "ls_goal", goal: null });
+        }
+        const media = [];
+        if (imageBlocks.length > 0 && desktop) {
+            const uploadDir = join(desktop.dataDir, "brain", nativeId, ".user_uploaded");
+            try {
+                mkdirSync(uploadDir, { recursive: true });
+            }
+            catch {
+                // ignore mkdir error
+            }
+            for (const img of imageBlocks) {
+                if (!img.data)
+                    continue;
+                const ext = extForMimeType(img.mimeType);
+                const fileName = `media_${Date.now()}_${randomBytes(4).toString("hex")}.${ext}`;
+                const filePath = join(uploadDir, fileName);
+                let savedUri;
+                try {
+                    writeFileSync(filePath, Buffer.from(img.data, "base64"));
+                    savedUri = filePath;
+                }
+                catch {
+                    // fallback to inlineData only
+                }
+                media.push({
+                    mimeType: img.mimeType,
+                    inlineData: img.data,
+                    ...(savedUri ? { uri: savedUri } : {}),
+                });
+            }
+        }
+        const fullText = context ? (text ? `${context}\n\n${text}` : context) : text;
+        const selectedModel = watcher.selectedModel;
+        watcher.running = true;
+        this.desktopSessionStates.set(nativeId, "running");
         this.host?.update(this.id, nativeId, { sessionUpdate: "ls_turn", state: "started" });
         this.host?.update(this.id, nativeId, { sessionUpdate: "ls_status", state: "running", turnActive: true });
         await callLanguageServer(conn, "SendUserCascadeMessage", {
             cascadeId: nativeId,
-            items: [{ text: fullText }],
+            items: [{ text: fullText || "请查看附图" }],
+            ...(media.length > 0 ? { media } : {}),
             ...(selectedModel ? { cascadeConfig: { plannerConfig: { requestedModel: { model: selectedModel } } } } : {}),
         });
-        if (transcriptPath && !this.desktopWatchers.has(nativeId)) {
-            const { nextLine } = parseAntigravityTranscript(transcriptPath, 0);
-            this.startWatchingDesktopTranscript(nativeId, transcriptPath, nextLine);
-        }
         return "started";
     }
     async cancel(nativeId) {
@@ -943,6 +1406,10 @@ export class AntigravityDriver extends AcpDriver {
                     killBackgroundTasks: false,
                 }).catch(() => { });
             }
+            const watcher = this.desktopWatchers.get(nativeId);
+            if (watcher)
+                watcher.running = false;
+            this.desktopSessionStates.set(nativeId, "idle");
             this.host?.update(this.id, nativeId, { sessionUpdate: "ls_turn", state: "ended", stopReason: "cancelled" });
             this.host?.update(this.id, nativeId, { sessionUpdate: "ls_status", state: "idle", turnActive: false });
             return;
@@ -956,6 +1423,7 @@ export class AntigravityDriver extends AcpDriver {
             const watcher = this.desktopWatchers.get(nativeId);
             if (watcher)
                 watcher.selectedModel = value;
+            this.host?.state(this.id, nativeId).set("agy-selected-model", value);
             await this.emitDesktopConfig(nativeId, value);
             return;
         }