minecodex 0.2.2 → 1.0.1

package/README.md

@@ -26,6 +26,8 @@ mcx install
 
 运行 `mcx install` 不会强制关闭或启动 Codex，也不会影响当前打开的窗口。安装完成后，终端会说明更改将在下一次重启 Codex 时生效，并询问是否立即重启；默认选项为 **No**。只有在您明确确认，或后续手动运行 `mcx restart` 时，才会重新打开 Codex。安装完成后，macOS 的“登录项与扩展”中会添加名为 **MineCodex** 的后台项目。
 
+`mcx install`、`mcx update`、`mcx restart` 和 `mcx uninstall` 会在终端持续显示当前阶段；`mcx open` 仅在需要启动后台服务时显示进度。查询类命令保持简洁，便于直接阅读或用于脚本。
+
 MineCodex 只以后台辅助服务运行，前台应用始终是 OpenAI 签名的官方 `ChatGPT.app`，并继续使用官方默认用户数据。通过 Dock、Finder、Spotlight、登录项或会话恢复打开 ChatGPT 时，后台服务会验证官方应用与对应进程；若该进程尚未开放兼容的本机调试端口，则确认其完整退出后再通过 LaunchServices 重新打开官方应用并注入功能。MineCodex 不修改 `ChatGPT.app`、`app.asar`、Dock 项目或默认打开方式。
 
 打开本地控制台：

package/features/hide-upsell-banner/src/hide-upsell-banner.mjs

@@ -15,7 +15,8 @@ function isUpsellBanner(element) {
   if (!text) return false;
   const isCard = element.classList.contains("rounded-2xl")
     && element.classList.contains("border")
-    && element.classList.contains("bg-token-main-surface-primary");
+    && (element.classList.contains("bg-token-main-surface-primary")
+      || element.classList.contains("bg-surface"));
   if (!isCard) return false;
   const titleMatch = /out of Codex and Work usage/i.test(text)
     || /out of Codex messages/i.test(text)

package/features/images/codex-feature.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "id": "images",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "label": {
     "en": "Images",
     "zh-CN": "图片"
@@ -16,7 +16,7 @@
   "pageScript": {
     "resource": "src/chatgpt-image-source-page.mjs"
   },
-  "hostActions": ["import-generated-image"],
+  "hostActions": ["import-generated-image", "create-image-edit-thread"],
   "placement": {
     "after": "sites",
     "order": 10

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

@@ -1,6 +1,7 @@
 import { createReadStream } from "node:fs";
-import { readFile, stat } from "node:fs/promises";
+import { mkdir, readFile, stat, writeFile } from "node:fs/promises";
 import { createServer as createNodeServer } from "node:http";
+import { randomUUID } from "node:crypto";
 import path from "node:path";
 import { MAX_IMPORTED_IMAGE_BYTES } from "./image-library.mjs";
 import { saveImageAs } from "./save-as.mjs";
@@ -11,6 +12,7 @@ const DEFAULT_PAGE_LIMIT = 36;
 const MAX_PAGE_LIMIT = 72;
 const MAX_PAGE_OFFSET = Number.MAX_SAFE_INTEGER;
 const MAX_IMPORT_BODY_BYTES = Math.ceil(MAX_IMPORTED_IMAGE_BYTES * 4 / 3) + 64 * 1024;
+const MAX_EDIT_AUXILIARY_BYTES = 8 * 1024 * 1024;
 
 const STATIC_FILES = new Map([
   ["/", ["index.html", "text/html; charset=utf-8"]],
@@ -134,6 +136,34 @@ async function readImportPayload(request) {
   return { ...payload, bytes };
 }
 
+async function readEditDraftPayload(request) {
+  if (!String(request.headers["content-type"] ?? "").toLowerCase().startsWith("application/json")) {
+    throw Object.assign(new Error("Image edit draft requires application/json"), { status: 415, code: "UNSUPPORTED_CONTENT_TYPE" });
+  }
+  let payload;
+  try {
+    payload = JSON.parse((await readRequestBody(request, Math.ceil(MAX_EDIT_AUXILIARY_BYTES * 4 / 3) + 8 * 1024)).toString("utf8"));
+  } catch (error) {
+    if (error.code === "BODY_TOO_LARGE") throw error;
+    throw Object.assign(new Error("Image edit draft must be valid JSON"), { status: 400, code: "INVALID_JSON" });
+  }
+  if (!payload || typeof payload !== "object" || Array.isArray(payload)
+    || !/^[a-f0-9]{24}$/.test(payload.imageId ?? "")) {
+    throw Object.assign(new Error("Image edit draft requires an image id"), { status: 400, code: "INVALID_EDIT_DRAFT" });
+  }
+  if (payload.auxiliaryPngBase64 === undefined) return { imageId: payload.imageId, auxiliary: null };
+  if (typeof payload.auxiliaryPngBase64 !== "string") {
+    throw Object.assign(new Error("Image edit auxiliary image must be base64"), { status: 400, code: "INVALID_EDIT_AUXILIARY" });
+  }
+  const auxiliary = Buffer.from(payload.auxiliaryPngBase64, "base64");
+  if (!auxiliary.length || auxiliary.length > MAX_EDIT_AUXILIARY_BYTES
+    || auxiliary.toString("base64") !== payload.auxiliaryPngBase64.replace(/\s/g, "")
+    || auxiliary.readUInt32BE(0) !== 0x89504e47) {
+    throw Object.assign(new Error("Image edit auxiliary image must be a bounded PNG"), { status: 400, code: "INVALID_EDIT_AUXILIARY" });
+  }
+  return { imageId: payload.imageId, auxiliary };
+}
+
 function contentTypeForPath(sourcePath) {
   const extension = path.extname(sourcePath).toLowerCase();
   return extension === ".jpg" || extension === ".jpeg"
@@ -225,6 +255,7 @@ export async function createHttpServer({
 }) {
   if (!library) throw new Error("library is required");
   if (!LOOPBACK_HOSTS.has(host)) throw new Error("Images only supports loopback hosts");
+  const editDrafts = new Map();
   const server = createNodeServer(async (request, response) => {
     try {
       applyCodexEmbedCors(request, response);
@@ -324,6 +355,41 @@ export async function createHttpServer({
         return;
       }
 
+      if (request.method === "POST" && url.pathname === "/api/image-edit-draft") {
+        const payload = await readEditDraftPayload(request);
+        const image = library.get(payload.imageId);
+        if (!image) {
+          json(response, 404, { error: "Image not found" });
+          return;
+        }
+        let auxiliaryPath = null;
+        if (payload.auxiliary) {
+          const editDir = path.join(library.dataDir, "edit-drafts");
+          await mkdir(editDir, { recursive: true });
+          auxiliaryPath = path.join(editDir, `${randomUUID()}.png`);
+          await writeFile(auxiliaryPath, payload.auxiliary, { mode: 0o600 });
+        }
+        const draftId = randomUUID();
+        editDrafts.set(draftId, { sourcePath: image.sourcePath, auxiliaryPath });
+        json(response, 201, { draftId });
+        return;
+      }
+
+      const editDraftMatch = url.pathname.match(/^\/api\/image-edit-draft\/([a-f0-9-]{36})$/);
+      if (request.method === "GET" && editDraftMatch) {
+        if (request.headers.origin !== CODEX_EMBED_ORIGIN) {
+          throw mutationError("Image edit attachments are available only to RuntimeHost", "ORIGIN_NOT_ALLOWED");
+        }
+        const draft = editDrafts.get(editDraftMatch[1]);
+        if (!draft) {
+          json(response, 404, { error: "Image edit draft not found" });
+          return;
+        }
+        editDrafts.delete(editDraftMatch[1]);
+        json(response, 200, draft);
+        return;
+      }
+
       const saveAsMatch = url.pathname.match(/^\/api\/images\/([a-f0-9]{24})\/save-as$/);
       if (request.method === "POST" && saveAsMatch) {
         const image = library.get(saveAsMatch[1]);

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

@@ -22,26 +22,61 @@ async function findThreadLogs(directory, threadId, output = []) {
   return output;
 }
 
-function promptFromEventLine(line) {
-  if (!line.includes('"image_generation_end"')) return null;
+function legacyPromptFromPayload(payload) {
+  if (payload?.type !== "image_generation_end") return null;
+  if (typeof payload.call_id !== "string" || typeof payload.revised_prompt !== "string") return null;
+  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 event = JSON.parse(line);
-    const payload = event?.payload ?? event;
-    if (payload?.type !== "image_generation_end") return null;
-    if (typeof payload.call_id !== "string" || typeof payload.revised_prompt !== "string") return null;
-    return { imageGenerationItemId: payload.call_id, prompt: payload.revised_prompt };
+    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 (!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 };
+}
+
 async function readPrompts(logPath, prompts) {
   const input = createReadStream(logPath, { encoding: "utf8" });
   const lines = createInterface({ input, crlfDelay: Infinity });
+  const wrappedPrompts = new Map();
   for await (const line of lines) {
-    const entry = promptFromEventLine(line);
-    if (entry && !prompts.has(entry.imageGenerationItemId)) {
-      prompts.set(entry.imageGenerationItemId, entry.prompt);
+    if (line.includes('"image_generation_end"') || line.includes("image_gen__imagegen")) {
+      let event;
+      try { event = JSON.parse(line); } catch { continue; }
+      const payload = event?.payload ?? event;
+      const legacy = legacyPromptFromPayload(payload);
+      if (legacy && !prompts.has(legacy.imageGenerationItemId)) {
+        prompts.set(legacy.imageGenerationItemId, legacy.prompt);
+      }
+      const wrapped = wrappedImagegenPrompt(payload);
+      if (wrapped) wrappedPrompts.set(wrapped.callId, wrapped.prompt);
+    }
+    const generated = generatedItemIdsFromOutputLine(line);
+    const prompt = generated ? wrappedPrompts.get(generated.callId) : null;
+    if (!prompt) continue;
+    for (const itemId of generated.itemIds) {
+      if (!prompts.has(itemId)) prompts.set(itemId, prompt);
     }
   }
 }