minecodex 1.2.1 → 1.2.2

package/features/images/codex-feature.json

@@ -16,12 +16,21 @@
   "pageScript": {
     "resource": "src/chatgpt-image-source-page.mjs"
   },
-  "hostActions": ["import-generated-image", "create-image-edit-thread", "open-sidebar"],
+  "hostActions": [
+    "import-generated-image",
+    "create-image-edit-thread",
+    "open-sidebar",
+    "list-cloud-images",
+    "import-cloud-image"
+  ],
   "placement": {
     "after": "sites",
     "order": 10
   },
-  "command": ["node", "src/main.mjs"],
+  "command": [
+    "node",
+    "src/main.mjs"
+  ],
   "icon": {
     "viewBox": "0 0 24 24",
     "markup": "<rect width=\"18\" height=\"18\" x=\"3\" y=\"3\" rx=\"2\" ry=\"2\"></rect><circle cx=\"9\" cy=\"9\" r=\"2\"></circle><path d=\"m21 15-3.086-3.086a2 2 0 0 0-2.828 0L6 21\"></path>"

package/features/images/src/http-server.mjs

@@ -48,7 +48,7 @@ function publicImage(image, { includePrompt = false } = {}) {
     downloadUrl: `/api/images/${image.id}/download`,
     sourceUrl: image.threadId.startsWith("chatgpt:") ? null : `codex://threads/${image.threadId}`,
   };
-  if (includePrompt) result.prompt = image.prompt;
+  if (includePrompt) { result.prompt = image.prompt; result.promptKind = image.promptKind; }
   return result;
 }
 
@@ -295,11 +295,13 @@ export async function createHttpServer({
 
       if (request.method === "GET" && url.pathname === "/api/images") {
         const { limit, offset } = paginationFor(url);
+        const snapshot = parseIntegerQuery(url.searchParams, "snapshot", { defaultValue: library.snapshot(), min: 0, max: Number.MAX_SAFE_INTEGER });
         const source = url.searchParams.get("source") ?? "all";
         const threadId = url.searchParams.get("threadId") || null;
         const sort = url.searchParams.get("sort") === "asc" ? "asc" : "desc";
         const query = url.searchParams.get("q") ?? "";
         const images = library.list({
+          snapshot,
           query,
           source,
           threadId,
@@ -309,7 +311,8 @@ export async function createHttpServer({
         }).map(publicImage);
         json(response, 200, {
           images,
-          count: library.count({ query, source, threadId }),
+          count: library.count({ query, source, threadId, snapshot }),
+          snapshot,
           limit,
           offset,
         });
@@ -323,18 +326,25 @@ export async function createHttpServer({
 
       if (request.method === "GET" && url.pathname === "/api/image-groups") {
         const { limit, offset } = paginationFor(url);
+        const snapshot = parseIntegerQuery(url.searchParams, "snapshot", { defaultValue: library.snapshot(), min: 0, max: Number.MAX_SAFE_INTEGER });
         const source = url.searchParams.get("source") ?? "all";
-        const groups = library.groups({ source, limit, offset }).map(publicGroup);
+        const groups = library.groups({ source, limit, offset, snapshot }).map(publicGroup);
         json(response, 200, {
           groups,
-          count: library.countGroups({ source }),
-          imageCount: library.count({ source }),
+          count: library.countGroups({ source, snapshot }),
+          imageCount: library.count({ source, snapshot }),
+          snapshot,
           limit,
           offset,
         });
         return;
       }
 
+      if (request.method === "GET" && url.pathname === "/api/cloud-image-cache") {
+        json(response, 200, { items: library.cloudCache() });
+        return;
+      }
+
       if (request.method === "POST" && url.pathname === "/api/rescan") {
         if (library.rescanStatus().inProgress) {
           json(response, 202, { imported: 0, total: library.count(), inProgress: true });

package/features/images/src/image-library.mjs

@@ -28,10 +28,15 @@ function imageIdFor(sourcePath) {
   return createHash("sha256").update(sourcePath).digest("hex").slice(0, 24);
 }
 
-function buildWhere({ query = "", source = "all", threadId = null } = {}) {
+function buildWhere({ query = "", source = "all", threadId = null, snapshot = null } = {}) {
   const clauses = [];
   const parameters = [];
 
+  if (snapshot !== null) {
+    clauses.push("images.rowid <= ?");
+    parameters.push(snapshot);
+  }
+
   if (threadId) {
     clauses.push("images.thread_id = ?");
     parameters.push(threadId);
@@ -153,6 +158,7 @@ function rowToImage(row) {
     imageGenerationItemId: row.image_generation_item_id,
     sourcePath: row.source_path,
     prompt: row.prompt,
+    promptKind: row.prompt_kind ?? "generation",
     width: row.width,
     height: row.height,
     byteLength: row.byte_length,
@@ -235,6 +241,10 @@ export class ImageLibrary {
         updated_at TEXT NOT NULL
       );
     `);
+    const imageColumns = new Set(this.database.prepare("PRAGMA table_info(images)").all().map(column => column.name));
+    for (const name of ["prompt_kind", "cloud_library_id", "cloud_version"]) {
+      if (!imageColumns.has(name)) this.database.exec(`ALTER TABLE images ADD COLUMN ${name} TEXT`);
+    }
     const threadSourceColumns = new Set(
       this.database.prepare("PRAGMA table_info(thread_sources)").all().map((column) => column.name),
     );
@@ -299,6 +309,10 @@ export class ImageLibrary {
     });
   }
 
+  snapshot() {
+    return this.database.prepare("SELECT COALESCE(MAX(rowid), 0) AS value FROM images").get().value;
+  }
+
   count(options = {}) {
     const { sql, parameters } = buildWhere(options);
     return this.database.prepare(`
@@ -309,8 +323,8 @@ export class ImageLibrary {
     `).get(...parameters).count;
   }
 
-  list({ query = "", source = "all", threadId = null, sort = "desc", limit = null, offset = 0 } = {}) {
-    const { sql, parameters } = buildWhere({ query, source, threadId });
+  list({ query = "", source = "all", threadId = null, sort = "desc", limit = null, offset = 0, snapshot = null } = {}) {
+    const { sql, parameters } = buildWhere({ query, source, threadId, snapshot });
     const pagination = Number.isInteger(limit) ? "LIMIT ? OFFSET ?" : "";
     if (pagination) parameters.push(limit, offset);
     const direction = sort === "asc" ? "ASC" : "DESC";
@@ -358,8 +372,8 @@ export class ImageLibrary {
     return { total: this.count(), chats, works, projects };
   }
 
-  countGroups({ source = "all" } = {}) {
-    const { sql, parameters } = buildWhere({ source });
+  countGroups({ source = "all", snapshot = null } = {}) {
+    const { sql, parameters } = buildWhere({ source, snapshot });
     return this.database.prepare(`
       SELECT COUNT(DISTINCT images.thread_id) AS count
       FROM images
@@ -368,8 +382,8 @@ export class ImageLibrary {
     `).get(...parameters).count;
   }
 
-  groups({ source = "all", limit = null, offset = 0, previewLimit = 4 } = {}) {
-    const { sql, parameters } = buildWhere({ source });
+  groups({ source = "all", limit = null, offset = 0, previewLimit = 4, snapshot = null } = {}) {
+    const { sql, parameters } = buildWhere({ source, snapshot });
     const pagination = Number.isInteger(limit) ? "LIMIT ? OFFSET ?" : "";
     if (pagination) parameters.push(limit, offset);
     const rows = this.database.prepare(`
@@ -400,10 +414,11 @@ export class ImageLibrary {
           FROM images
           LEFT JOIN thread_sources ON thread_sources.thread_id = images.thread_id
           WHERE images.thread_id IN (${placeholders})
+            ${snapshot === null ? "" : "AND images.rowid <= ?"}
         )
         WHERE preview_rank <= ?
         ORDER BY thread_id ASC, created_at ASC, id ASC
-      `).all(...threadIds, previewLimit);
+      `).all(...threadIds, ...(snapshot === null ? [] : [snapshot]), previewLimit);
       for (const previewRow of previewRows) {
         const previews = previewsByThread.get(previewRow.thread_id) ?? [];
         previews.push(rowToImage(previewRow));
@@ -621,6 +636,10 @@ export class ImageLibrary {
     return true;
   }
 
+  cloudCache() {
+    return this.database.prepare("SELECT cloud_library_id AS libraryId, cloud_version AS version FROM images WHERE cloud_library_id IS NOT NULL").all();
+  }
+
   async importExternalImage({
     bytes,
     mimeType,
@@ -630,6 +649,9 @@ export class ImageLibrary {
     sourceKind,
     prompt = null,
     createdAt = null,
+    promptKind = "generation",
+    cloudLibraryId = null,
+    cloudVersion = null,
   } = {}) {
     if (!this.isLifecycleActive() || !Buffer.isBuffer(bytes)) return { imported: false, reason: "INVALID_BYTES" };
     const normalizedMime = normalizedImportMime(mimeType);
@@ -660,10 +682,15 @@ export class ImageLibrary {
     const assetDir = path.join(this.dataDir, "external-images");
     const sourcePath = path.join(assetDir, `${id}.${extension}`);
     const existing = this.database.prepare("SELECT source_path, byte_length FROM images WHERE id = ?").get(id);
+    const updateCloudMetadata = () => {
+      if (typeof cloudLibraryId !== "string" || !/^libfile_[\w-]+$/.test(cloudLibraryId)) return;
+      this.database.prepare("UPDATE images SET cloud_library_id = ?, cloud_version = ?, prompt = ?, prompt_kind = ? WHERE id = ?")
+        .run(cloudLibraryId, String(cloudVersion ?? "").slice(0, 256), safePrompt, promptKind === "request" ? "request" : "generation", id);
+    };
     if (existing && existing.byte_length === bytes.length) {
       try {
         const existingBytes = await readFile(existing.source_path);
-        if (existingBytes.equals(bytes)) return { imported: false, id, reason: "DUPLICATE" };
+        if (existingBytes.equals(bytes)) { updateCloudMetadata(); return { imported: false, id, reason: "DUPLICATE" }; }
       } catch (error) {
         if (error.code !== "ENOENT") throw error;
       }
@@ -712,6 +739,7 @@ export class ImageLibrary {
         normalizedCreatedAt,
         importedAt,
       );
+    updateCloudMetadata();
     this.database
       .prepare(`
         INSERT INTO thread_sources (

package/features/images/src/prompt-index.mjs

@@ -3,6 +3,8 @@ import { readdir, stat } from "node:fs/promises";
 import path from "node:path";
 import { createInterface } from "node:readline";
 
+import { tracePromptSource, recordedCommandOutput } from "./prompt-source.mjs";
+
 const DEFAULT_NEGATIVE_CACHE_TTL_MS = 5_000;
 
 async function findThreadLogs(directory, threadId, output = []) {
@@ -28,40 +30,26 @@ function legacyPromptFromPayload(payload) {
   return { imageGenerationItemId: payload.call_id, prompt: payload.revised_prompt };
 }
 
-function wrappedImagegenPrompt(payload) {
-  if (payload?.type !== "custom_tool_call" || payload.name !== "exec") return null;
-  if (typeof payload.call_id !== "string" || typeof payload.input !== "string") return null;
-  const marker = "tools.image_gen__imagegen";
-  const markerIndex = payload.input.indexOf(marker);
-  if (markerIndex < 0) return null;
-  const generatedImageIndex = payload.input.indexOf("generatedImage(", markerIndex + marker.length);
-  const callSource = payload.input.slice(markerIndex, generatedImageIndex < 0 ? undefined : generatedImageIndex);
-  const match = callSource.match(/\bprompt\s*:\s*("(?:\\.|[^"\\])*")/s);
-  if (!match) return null;
-  try {
-    const prompt = JSON.parse(match[1]);
-    return typeof prompt === "string" ? { callId: payload.call_id, prompt } : null;
-  } catch {
-    return null;
-  }
-}
-
 function generatedItemIdsFromOutputLine(line) {
-  if (!line.includes('"type":"custom_tool_call_output"') || !line.includes("generated_images")) return null;
-  const callId = line.match(/"call_id":"([a-zA-Z0-9_-]+)"/)?.[1];
+  if (!/"type"\s*:\s*"(?:custom_tool_call_output|function_call_output)"/.test(line)) return null;
+  const callId = line.match(/"call_id"\s*:\s*"([a-zA-Z0-9_-]+)"/)?.[1];
   if (!callId) return null;
   const itemIds = new Set();
   const pattern = /generated_images[\\/][^\\/\s]+[\\/]([a-zA-Z0-9_-]+)\.png\b/g;
   for (const match of line.matchAll(pattern)) itemIds.add(match[1]);
-  return { callId, itemIds };
+  const cellId = line.match(/Script running with cell ID ([a-zA-Z0-9_-]+)/)?.[1];
+  return { callId, itemIds, cellId };
 }
 
 async function readPrompts(logPath, prompts) {
   const input = createReadStream(logPath, { encoding: "utf8" });
   const lines = createInterface({ input, crlfDelay: Infinity });
   const wrappedPrompts = new Map();
+  const cellPrompts = new Map();
+  const stored = new Map();
+  const pendingSources = new Map();
   for await (const line of lines) {
-    if (line.includes('"image_generation_end"') || line.includes("image_gen__imagegen")) {
+    if (line.includes('"image_generation_end"') || /"type"\s*:\s*"custom_tool_call"/.test(line) || /"name"\s*:\s*"wait"/.test(line) || [...pendingSources.keys()].some(id => line.includes(id))) {
       let event;
       try { event = JSON.parse(line); } catch { continue; }
       const payload = event?.payload ?? event;
@@ -69,12 +57,27 @@ async function readPrompts(logPath, prompts) {
       if (legacy && !prompts.has(legacy.imageGenerationItemId)) {
         prompts.set(legacy.imageGenerationItemId, legacy.prompt);
       }
-      const wrapped = wrappedImagegenPrompt(payload);
-      if (wrapped) wrappedPrompts.set(wrapped.callId, wrapped.prompt);
+      if (payload?.type === "custom_tool_call" && payload.name === "exec" && typeof payload.input === "string") {
+        const prompt = tracePromptSource(payload.input, new Map(stored));
+        if (prompt) wrappedPrompts.set(payload.call_id, prompt);
+        if (/\bstore\s*\(/.test(payload.input)) pendingSources.set(payload.call_id, payload.input);
+      }
+      if (payload?.type === "custom_tool_call_output" && pendingSources.has(payload.call_id)) {
+        tracePromptSource(pendingSources.get(payload.call_id), stored, recordedCommandOutput(payload.output));
+        pendingSources.delete(payload.call_id);
+      }
+      if (payload?.type === "function_call" && payload.name === "wait") {
+        try {
+          const args = JSON.parse(payload.arguments);
+          const prompt = cellPrompts.get(String(args.cell_id));
+          if (prompt) wrappedPrompts.set(payload.call_id, prompt);
+        } catch { /* 不完整的调用记录无法关联。 */ }
+      }
     }
     const generated = generatedItemIdsFromOutputLine(line);
     const prompt = generated ? wrappedPrompts.get(generated.callId) : null;
     if (!prompt) continue;
+    if (generated.cellId) cellPrompts.set(generated.cellId, prompt);
     for (const itemId of generated.itemIds) {
       if (!prompts.has(itemId)) prompts.set(itemId, prompt);
     }

package/features/images/src/prompt-source.mjs

@@ -0,0 +1,100 @@
+import { parse } from "acorn";
+
+// 仅解释可确定的字符串表达式，不执行会话中的 JavaScript 或历史工具。
+export function tracePromptSource(source, stored, recordedOutput) {
+  let program;
+  try { program = parse(source, { ecmaVersion: "latest", sourceType: "module" }); }
+  catch { stored.clear(); return null; }
+  const locals = new Map();
+  const isCall = (node, name) => node?.type === "CallExpression" && node.callee.type === "Identifier" && node.callee.name === name;
+  const isTool = (node, name) => node?.type === "CallExpression" && node.callee.type === "MemberExpression"
+    && !node.callee.computed && node.callee.object.name === "tools" && node.callee.property.name === name;
+  const statements = program.body;
+  const commandVariables = statements.flatMap(statement => statement.type === "VariableDeclaration"
+    ? statement.declarations.filter(d => d.id.type === "Identifier" && isTool(d.init?.argument, "exec_command")).map(d => d.id.name)
+    : []);
+  const echoedOutput = commandVariables.length === 1 && statements.some(statement => {
+    const call = statement.expression;
+    const arg = call?.arguments?.[0];
+    return isCall(call, "text") && call.arguments.length === 1 && arg?.type === "MemberExpression"
+      && !arg.computed && arg.object.name === commandVariables[0] && arg.property.name === "output";
+  });
+  let prompt = null;
+  let imageCalls = 0;
+  function value(node) {
+    if (!node) return undefined;
+    if (node.type === "Literal") return typeof node.value === "string" || typeof node.value === "number" ? node.value : undefined;
+    if (node.type === "Identifier") return locals.get(node.name);
+    if (node.type === "AssignmentExpression" && node.left.type === "Identifier") {
+      const result = node.operator === "=" ? value(node.right) : undefined;
+      locals.set(node.left.name, result);
+      return result;
+    }
+    if (node.type === "TemplateLiteral") {
+      const parts = node.expressions.map(value);
+      if (parts.some(part => typeof part !== "string" && typeof part !== "number")) return undefined;
+      return node.quasis.map((part, i) => part.value.cooked + (parts[i] ?? "")).join("");
+    }
+    if (node.type === "BinaryExpression" && node.operator === "+") {
+      const left = value(node.left), right = value(node.right);
+      if (![left, right].every(part => typeof part === "string" || typeof part === "number")) return undefined;
+      return left + right;
+    }
+    if (node.type === "AwaitExpression") return value(node.argument);
+    if (node.type === "MemberExpression" && !node.computed && node.property.name === "output") return value(node.object)?.output;
+    if (isCall(node, "load") && node.arguments.length === 1) return stored.get(value(node.arguments[0]));
+    if (isCall(node, "generatedImage") || isCall(node, "text")) {
+      node.arguments.forEach(value);
+      return undefined;
+    }
+    if (isCall(node, "store") && node.arguments.length === 2) {
+      const key = value(node.arguments[0]), result = value(node.arguments[1]);
+      if (typeof key === "string") {
+        if (typeof result === "string") stored.set(key, result);
+        else stored.delete(key);
+      }
+      return undefined;
+    }
+    if (isTool(node, "exec_command")) return echoedOutput && typeof recordedOutput === "string" ? { output: recordedOutput } : undefined;
+    if (isTool(node, "image_gen__imagegen")) {
+      imageCalls += 1;
+      const options = node.arguments[0];
+      if (options?.type === "ObjectExpression") {
+        const field = options.properties.find(p => p.type === "Property" && !p.computed && (p.key.name ?? p.key.value) === "prompt");
+        const resolved = value(field?.value);
+        if (typeof resolved === "string") prompt = resolved;
+      }
+      return undefined;
+    }
+    if (node.type === "CallExpression" && node.callee.type === "MemberExpression" && !node.callee.computed) {
+      const receiver = value(node.callee.object), args = node.arguments.map(value);
+      if (typeof receiver !== "string" || args.some(arg => arg === undefined)) return undefined;
+      const method = node.callee.property.name;
+      if (method === "indexOf" && typeof args[0] === "string" && args.length === 1) return receiver.indexOf(args[0]);
+      if (["slice", "substring"].includes(method) && args.length <= 2 && args.every(Number.isInteger)) return receiver[method](...args);
+      if (method === "trim" && args.length === 0) return receiver.trim();
+    }
+    return undefined;
+  }
+  for (const statement of statements) {
+    if (statement.type === "VariableDeclaration") {
+      for (const declaration of statement.declarations) {
+        if (declaration.id.type === "Identifier") locals.set(declaration.id.name, value(declaration.init));
+      }
+    } else if (statement.type === "ExpressionStatement") value(statement.expression);
+    else if (statement.type !== "EmptyStatement") {
+      // 分支和循环的实际执行路径不可确定，不能沿用旧存储值。
+      stored.clear();
+      return null;
+    }
+  }
+  return imageCalls === 1 ? prompt : null;
+}
+
+export function recordedCommandOutput(output) {
+  if (!Array.isArray(output)) return undefined;
+  const texts = output.filter(part => part.type === "input_text" && typeof part.text === "string")
+    .map(part => part.text).filter(text => !/^Script (?:completed|running)\b/.test(text));
+  if (texts.length !== 1 || /(?:output truncated|tokens truncated|Warning: truncated)/i.test(texts[0])) return undefined;
+  return texts[0];
+}