@4yi-dev/cli 0.1.13 → 0.1.15

package/README.md

@@ -26,6 +26,7 @@ Both packages install the `4yi` command. The dev package points at `https://xcla
 4yi code
 4yi connect claude
 4yi connect codex
+4yi migrate codex
 4yi status all
 4yi restore all
 ```
@@ -40,6 +41,8 @@ On macOS, `4yi connect claude` also configures an installed Claude Desktop throu
 
 Codex CLI and Codex App share the same Codex home on native Windows (`%USERPROFILE%\\.codex`). After `4yi connect codex`, finish active App tasks, fully quit and reopen the App, and start a new chat so its embedded Codex process loads the new provider. Microsoft Store/AppX installations may not expose a conventional executable path, but that detection does not gate the shared configuration update.
 
+Existing Codex tasks keep the provider they were created with. Run `4yi migrate codex`, choose a recent task by number, and 4YI creates a new task with the same history and project using your Plan's default model. The original task is not modified. Scripts can use `--thread <id>` and optionally `--model <id>`.
+
 The Codex provider uses the official command-backed authentication configuration. Its helper reads the current token from `~/.4yi/config.json`; `config.toml` and the model catalog do not contain the bearer token.
 
 For local development:

package/bin/4yi.mjs

@@ -2,16 +2,20 @@
 import { login, loadSession, clearSession } from "../src/auth.mjs";
 import { runCode } from "../src/opencode.mjs";
 import { connect, connectionStatus, prepareConnectionTools, restoreConnection } from "../src/connect.mjs";
+import { migrateCodexTask } from "../src/codex-migrate.mjs";
 
 const command = process.argv[2] || "help";
 
 if (command === "help" || command === "--help" || command === "-h") {
-  console.log("Usage: 4yi <login|whoami|logout|code|connect|status|restore>");
+  console.log("Usage: 4yi <login|whoami|logout|code|connect|migrate|status|restore>");
   console.log("  4yi code            launch OpenCode; switch models live with Tab / /models");
   console.log("  4yi code --model X  pin model X as the default for future sessions");
   console.log("  4yi connect <claude|codex|all>  connect existing coding tools to 4YI");
   console.log("    --yes                         install a missing CLI without prompting");
   console.log("    Claude on macOS also configures installed Claude Desktop 3P Gateway mode");
+  console.log("  4yi migrate codex              continue an existing Codex task through 4YI");
+  console.log("    --thread ID                  select a specific task without prompting");
+  console.log("    --model X                    choose a model (defaults to your Plan model)");
   console.log("  4yi status [claude|codex|all]   inspect the current connection");
   console.log("  4yi restore <claude|codex|all>  restore the latest protected config");
   process.exit(0);
@@ -39,6 +43,29 @@ function parseConnectArgs(args) {
   return { target, scope, platformUrl, claudeBaseUrl, codexBaseUrl, skipCheck, autoInstall };
 }
 
+function parseMigrateArgs(args) {
+  const target = args[0];
+  if (target !== "codex") throw new Error("Use `4yi migrate codex`.");
+  let threadId;
+  let model;
+  for (let i = 1; i < args.length; i += 1) {
+    const arg = args[i];
+    if (arg === "--thread") {
+      threadId = args[++i];
+      if (!threadId || threadId.startsWith("-")) throw new Error("--thread requires a task id.");
+    }
+    else if (arg.startsWith("--thread=")) threadId = arg.slice("--thread=".length);
+    else if (arg === "--model" || arg === "-m") {
+      model = args[++i];
+      if (!model || model.startsWith("-")) throw new Error("--model requires a model id.");
+    }
+    else if (arg.startsWith("--model=")) model = arg.slice("--model=".length);
+    else throw new Error(`Unknown option: ${arg}`);
+  }
+  if (threadId === "" || model === "") throw new Error("--thread and --model require a value.");
+  return { threadId, model };
+}
+
 /** Split out `--model <id>` / `--model=<id>` / `-m <id>`; the rest pass through to OpenCode. */
 function parseCodeArgs(args) {
   let preferredModel = null;
@@ -87,6 +114,10 @@ try {
       session = loadSession();
     }
     await connect({ session, ...connectArgs, skipToolCheck: true });
+  } else if (command === "migrate") {
+    const migrateArgs = parseMigrateArgs(process.argv.slice(3));
+    const session = loadSession();
+    await migrateCodexTask({ session, ...migrateArgs });
   } else if (command === "status") {
     const { target, scope } = parseConnectArgs(process.argv.slice(3));
     connectionStatus({ target, scope });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4yi-dev/cli",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "4YI command-line launcher for OAuth login and OpenCode runtime",
   "type": "module",
   "bin": {

package/src/codex-migrate.mjs

@@ -0,0 +1,361 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import process from "node:process";
+import { spawn as nodeSpawn } from "node:child_process";
+import { createInterface } from "node:readline/promises";
+import { requestJson } from "./http.mjs";
+
+const DEFAULT_LIMIT = 10;
+const REQUEST_TIMEOUT_MS = 15_000;
+const SESSION_SCAN_LIMIT = 500;
+const SESSION_PREFIX_BYTES = 256 * 1024;
+
+function executableName(command, platform = process.platform) {
+  return platform === "win32" ? `${command}.cmd` : command;
+}
+
+function appServerLaunch({ command, args, env, platform }) {
+  if (platform !== "win32") return { command, args, shell: false };
+  // Node 24 warns when `shell: true` receives an argv array (DEP0190). Invoke
+  // cmd.exe explicitly with constant, non-user-controlled arguments instead.
+  const shell = env.ComSpec || env.COMSPEC || "cmd.exe";
+  return { command: shell, args: ["/d", "/s", "/c", `${command} ${args.join(" ")}`], shell: false };
+}
+
+function oneLine(value, fallback) {
+  const line = String(value || "").split(/\r?\n/, 1)[0].replace(/\s+/g, " ").trim();
+  if (!line) return fallback;
+  return line.length > 64 ? `${line.slice(0, 61)}...` : line;
+}
+
+function relativeTime(timestamp, now = Date.now()) {
+  const elapsed = Math.max(0, Math.floor(now / 1000) - Number(timestamp || 0));
+  if (elapsed < 60) return "刚刚";
+  if (elapsed < 3600) return `${Math.floor(elapsed / 60)} 分钟前`;
+  if (elapsed < 86400) return `${Math.floor(elapsed / 3600)} 小时前`;
+  if (elapsed < 86400 * 30) return `${Math.floor(elapsed / 86400)} 天前`;
+  return new Date(Number(timestamp) * 1000).toLocaleDateString();
+}
+
+function codexHomeForEnv(env = process.env) {
+  if (env.CODEX_HOME) return env.CODEX_HOME;
+  const home = env.HOME || env.USERPROFILE || os.homedir();
+  return path.join(home, ".codex");
+}
+
+function collectSessionFiles(root) {
+  const files = [];
+  const pending = [root];
+  while (pending.length > 0) {
+    const directory = pending.pop();
+    let entries;
+    try { entries = fs.readdirSync(directory, { withFileTypes: true }); } catch { continue; }
+    for (const entry of entries) {
+      const file = path.join(directory, entry.name);
+      if (entry.isDirectory()) pending.push(file);
+      else if (entry.isFile() && entry.name.endsWith(".jsonl")) {
+        try { files.push({ file, mtimeMs: fs.statSync(file).mtimeMs }); } catch { /* Ignore a file removed during scanning. */ }
+      }
+    }
+  }
+  return files.sort((left, right) => right.mtimeMs - left.mtimeMs).slice(0, SESSION_SCAN_LIMIT);
+}
+
+function readFilePrefix(file) {
+  const descriptor = fs.openSync(file, "r");
+  try {
+    const buffer = Buffer.alloc(SESSION_PREFIX_BYTES);
+    const bytes = fs.readSync(descriptor, buffer, 0, buffer.length, 0);
+    return buffer.toString("utf8", 0, bytes);
+  } finally {
+    fs.closeSync(descriptor);
+  }
+}
+
+function messageText(payload) {
+  if (payload?.type === "message" && payload.role === "user") {
+    if (typeof payload.content === "string") return payload.content;
+    if (Array.isArray(payload.content)) {
+      return payload.content
+        .map((item) => item?.text || item?.input_text || "")
+        .filter(Boolean)
+        .join(" ");
+    }
+  }
+  if (payload?.type === "user_message") return payload.message || payload.text || "";
+  return "";
+}
+
+function sessionThreadFromFile({ file, mtimeMs }) {
+  let text;
+  try { text = readFilePrefix(file); } catch { return null; }
+  let metadata;
+  let preview = "";
+  for (const line of text.split(/\r?\n/)) {
+    if (!line.trim()) continue;
+    let record;
+    try { record = JSON.parse(line); } catch { continue; }
+    if (record.type === "session_meta") metadata = record.payload;
+    if (!preview && (record.type === "response_item" || record.type === "event_msg")) {
+      preview = messageText(record.payload);
+    }
+    if (metadata && preview) break;
+  }
+  const id = metadata?.id || metadata?.session_id;
+  if (!id) return null;
+  const created = Date.parse(metadata.timestamp || "");
+  return {
+    id,
+    modelProvider: metadata.model_provider || metadata.modelProvider || "openai",
+    cwd: metadata.cwd || "",
+    preview,
+    createdAt: Number.isFinite(created) ? Math.floor(created / 1000) : Math.floor(mtimeMs / 1000),
+    updatedAt: Math.floor(mtimeMs / 1000),
+    recencyAt: Math.floor(mtimeMs / 1000),
+    ephemeral: false,
+  };
+}
+
+export function scanCodexSessionThreads({ codexHome = codexHomeForEnv() } = {}) {
+  const sessions = path.join(codexHome, "sessions");
+  return collectSessionFiles(sessions).map(sessionThreadFromFile).filter(Boolean);
+}
+
+function mergeCandidateThreads(serverThreads, sessionThreads, limit) {
+  const threads = new Map();
+  for (const thread of sessionThreads) if (thread?.id) threads.set(thread.id, thread);
+  for (const thread of serverThreads) if (thread?.id) threads.set(thread.id, { ...threads.get(thread.id), ...thread });
+  return [...threads.values()]
+    .filter((thread) => thread.modelProvider !== "4yi" && !thread.ephemeral)
+    .sort((left, right) => {
+      const leftTime = left.recencyAt || left.updatedAt || left.createdAt || 0;
+      const rightTime = right.recencyAt || right.updatedAt || right.createdAt || 0;
+      return rightTime - leftTime;
+    })
+    .slice(0, limit);
+}
+
+export function describeCodexThread(thread, { now = Date.now() } = {}) {
+  const title = oneLine(thread.name || thread.preview, "未命名任务");
+  const project = path.basename(String(thread.cwd || "")) || String(thread.cwd || "未知项目");
+  const updatedAt = thread.recencyAt || thread.updatedAt || thread.createdAt;
+  return { title, project, age: relativeTime(updatedAt, now) };
+}
+
+export async function selectCodexThread(threads, {
+  input = process.stdin,
+  output = process.stdout,
+  now = Date.now(),
+} = {}) {
+  if (!input?.isTTY || !output?.isTTY) {
+    throw new Error("Interactive task selection requires a terminal. Use --thread <id> in scripts.");
+  }
+
+  output.write("选择要迁移到 4YI 的 Codex 任务：\n\n");
+  threads.forEach((thread, index) => {
+    const item = describeCodexThread(thread, { now });
+    output.write(`${index + 1}. ${item.title}\n   ${item.project} · ${item.age}\n`);
+  });
+
+  const readline = createInterface({ input, output });
+  try {
+    while (true) {
+      const answer = await readline.question("\n输入序号（默认 1，q 取消）：");
+      const value = answer.trim().toLowerCase();
+      if (value === "q" || value === "quit") return null;
+      const index = value === "" ? 0 : Number(value) - 1;
+      if (Number.isInteger(index) && index >= 0 && index < threads.length) return threads[index];
+      output.write(`请输入 1-${threads.length} 之间的序号。\n`);
+    }
+  } finally {
+    readline.close();
+  }
+}
+
+export class CodexAppServerClient {
+  constructor({
+    command = executableName("codex"),
+    args = ["app-server", "--stdio"],
+    env = process.env,
+    platform = process.platform,
+    spawn = nodeSpawn,
+    timeoutMs = REQUEST_TIMEOUT_MS,
+  } = {}) {
+    this.nextId = 1;
+    this.pending = new Map();
+    this.stderr = "";
+    this.timeoutMs = timeoutMs;
+    const launch = appServerLaunch({ command, args, env, platform });
+    this.child = spawn(launch.command, launch.args, {
+      env,
+      shell: launch.shell,
+      stdio: ["pipe", "pipe", "pipe"],
+    });
+
+    let stdoutBuffer = "";
+    this.child.stdout.setEncoding("utf8");
+    this.child.stdout.on("data", (chunk) => {
+      stdoutBuffer += chunk;
+      const lines = stdoutBuffer.split(/\r?\n/);
+      stdoutBuffer = lines.pop() || "";
+      for (const line of lines) this.#handleLine(line);
+    });
+    this.child.stderr.setEncoding("utf8");
+    this.child.stderr.on("data", (chunk) => {
+      this.stderr = `${this.stderr}${chunk}`.slice(-4000);
+    });
+    this.child.on("error", (error) => this.#rejectAll(error));
+    this.child.on("exit", (code, signal) => {
+      if (this.pending.size === 0) return;
+      const detail = this.stderr.trim();
+      const exitReason = signal || (code ?? "unknown");
+      this.#rejectAll(new Error(`Codex app-server stopped (${exitReason}).${detail ? ` ${detail}` : ""}`));
+    });
+  }
+
+  #handleLine(line) {
+    if (!line.trim()) return;
+    let message;
+    try { message = JSON.parse(line); } catch { return; }
+    if (message.id === undefined || message.id === null) return;
+    const pending = this.pending.get(message.id);
+    if (!pending) return;
+    this.pending.delete(message.id);
+    clearTimeout(pending.timer);
+    if (message.error) {
+      const text = message.error.message || JSON.stringify(message.error);
+      pending.reject(new Error(text));
+    } else {
+      pending.resolve(message.result);
+    }
+  }
+
+  #rejectAll(error) {
+    for (const pending of this.pending.values()) {
+      clearTimeout(pending.timer);
+      pending.reject(error);
+    }
+    this.pending.clear();
+  }
+
+  request(method, params = {}) {
+    const id = this.nextId++;
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => {
+        this.pending.delete(id);
+        reject(new Error(`Codex app-server timed out while calling ${method}.`));
+      }, this.timeoutMs);
+      this.pending.set(id, { resolve, reject, timer });
+      this.child.stdin.write(`${JSON.stringify({ id, method, params })}\n`, (error) => {
+        if (!error) return;
+        clearTimeout(timer);
+        this.pending.delete(id);
+        reject(error);
+      });
+    });
+  }
+
+  notify(method, params = {}) {
+    this.child.stdin.write(`${JSON.stringify({ method, params })}\n`);
+  }
+
+  async initialize() {
+    const result = await this.request("initialize", {
+      clientInfo: { name: "4yi-cli", version: "0.1.0" },
+      capabilities: { experimentalApi: true },
+    });
+    this.notify("initialized", {});
+    return result;
+  }
+
+  async close() {
+    this.child.stdin.end();
+    if (this.child.exitCode !== null) return;
+    await new Promise((resolve) => {
+      const timer = setTimeout(() => {
+        this.child.kill();
+        resolve();
+      }, 1000);
+      this.child.once("exit", () => {
+        clearTimeout(timer);
+        resolve();
+      });
+    });
+  }
+}
+
+async function loadDefaultCodexModel(session) {
+  const response = await requestJson(session.baseUrl, "/api/cli/models?runtime=codex", { token: session.token });
+  const ids = (response?.models || []).map((model) => model?.id).filter(Boolean);
+  if (ids.length === 0) throw new Error("Your active Plan has no Codex-compatible Responses models.");
+  return ids.includes(response.default_model) ? response.default_model : ids[0];
+}
+
+export async function migrateCodexTask({
+  session,
+  threadId,
+  model,
+  limit = DEFAULT_LIMIT,
+  input = process.stdin,
+  output = process.stdout,
+  stdout = console.log,
+  client,
+  clientOptions = {},
+  selectThread = selectCodexThread,
+  scanThreads = scanCodexSessionThreads,
+} = {}) {
+  if (!session?.token) throw new Error("Not signed in. Run `4yi login`.");
+  const selectedModel = model || await loadDefaultCodexModel(session);
+  const appServer = client || new CodexAppServerClient(clientOptions);
+  try {
+    await appServer.initialize();
+    let selected;
+    if (threadId) {
+      selected = { id: threadId };
+    } else {
+      const response = await appServer.request("thread/list", {
+        limit: Math.max(limit * 3, 30),
+        sortKey: "updated_at",
+        sortDirection: "desc",
+      });
+      const sessionThreads = scanThreads({ codexHome: codexHomeForEnv(clientOptions.env || process.env) });
+      const candidates = mergeCandidateThreads(response?.data || [], sessionThreads, limit);
+      if (candidates.length === 0) {
+        throw new Error("没有自动找到可迁移的旧 Codex 任务。新任务已经会默认使用 4YI；如已知任务 ID，可运行 `4yi migrate codex --thread <任务ID>`。");
+      }
+      selected = await selectThread(candidates, { input, output });
+      if (!selected) {
+        stdout("已取消，没有修改任何任务。");
+        return { cancelled: true };
+      }
+    }
+
+    stdout(`正在创建新的 4YI 任务（${selectedModel}）…`);
+    const result = await appServer.request("thread/fork", {
+      threadId: selected.id,
+      model: selectedModel,
+      modelProvider: "4yi",
+      excludeTurns: true,
+    });
+    if (!result?.thread?.id) throw new Error("Codex did not return the migrated task id.");
+    if (result.modelProvider !== "4yi" && result.thread.modelProvider !== "4yi") {
+      throw new Error("Codex created the task but did not apply the 4YI provider.");
+    }
+    stdout("✓ 已创建新的 4YI 任务，原任务未修改。");
+    stdout(`新任务 ID: ${result.thread.id}`);
+    return { cancelled: false, sourceThreadId: selected.id, threadId: result.thread.id, model: selectedModel };
+  } finally {
+    if (!client) await appServer.close();
+  }
+}
+
+export const __testing = {
+  appServerLaunch,
+  codexHomeForEnv,
+  loadDefaultCodexModel,
+  mergeCandidateThreads,
+  relativeTime,
+  scanCodexSessionThreads,
+  sessionThreadFromFile,
+};

package/src/connect.mjs

@@ -97,10 +97,21 @@ function executableName(command, platform = process.platform) {
   return platform === "win32" ? `${command}.cmd` : command;
 }
 
-function commandAvailable(command, { platform = process.platform, spawn = spawnSync } = {}) {
-  const result = spawn(executableName(command, platform), ["--version"], {
+function commandLaunch(command, args, { platform = process.platform, env = process.env } = {}) {
+  if (platform !== "win32") return { command, args, shell: false };
+  // Avoid Node 24 DEP0190 by invoking cmd.exe explicitly. Every token passed
+  // here is owned by the CLI (tool names, fixed flags, and npm package names),
+  // never user input.
+  const shell = env.ComSpec || env.COMSPEC || "cmd.exe";
+  return { command: shell, args: ["/d", "/s", "/c", `${command} ${args.join(" ")}`], shell: false };
+}
+
+function commandAvailable(command, { platform = process.platform, env = process.env, spawn = spawnSync } = {}) {
+  const launch = commandLaunch(executableName(command, platform), ["--version"], { platform, env });
+  const result = spawn(launch.command, launch.args, {
     encoding: "utf8",
-    shell: platform === "win32",
+    env,
+    shell: launch.shell,
     stdio: "ignore",
   });
   return !result.error && result.status === 0;
@@ -123,29 +134,32 @@ async function ensureToolCli(target, {
   input = process.stdin,
   output = process.stdout,
   platform = process.platform,
+  env = process.env,
   spawn = spawnSync,
   stdout = console.log,
 } = {}) {
   const meta = TOOL_METADATA[target];
-  if (commandAvailable(meta.command, { platform, spawn })) return { installed: false };
+  if (commandAvailable(meta.command, { platform, env, spawn })) return { installed: false };
 
   const approved = autoInstall || await confirmInstall(meta, { input, output });
   if (!approved) {
     throw new Error(`${meta.label} CLI is required. Install it with \`npm install -g ${meta.npmPackage}\`, then run this command again.`);
   }
-  if (!commandAvailable("npm", { platform, spawn })) {
+  if (!commandAvailable("npm", { platform, env, spawn })) {
     throw new Error(`npm is required to install ${meta.label} CLI automatically. Install Node.js/npm, then run this command again.`);
   }
 
   stdout(`Installing ${meta.label} CLI (${meta.npmPackage})...`);
-  const result = spawn(executableName("npm", platform), ["install", "-g", meta.npmPackage], {
-    shell: platform === "win32",
+  const launch = commandLaunch(executableName("npm", platform), ["install", "-g", meta.npmPackage], { platform, env });
+  const result = spawn(launch.command, launch.args, {
+    env,
+    shell: launch.shell,
     stdio: "inherit",
   });
   if (result.error || result.status !== 0) {
     throw new Error(`Could not install ${meta.label} CLI automatically. Run \`npm install -g ${meta.npmPackage}\` and try again.`);
   }
-  if (!commandAvailable(meta.command, { platform, spawn })) {
+  if (!commandAvailable(meta.command, { platform, env, spawn })) {
     throw new Error(`${meta.label} CLI was installed, but \`${meta.command}\` is not available in this terminal. Open a new terminal and run this command again.`);
   }
   stdout(`${meta.label} CLI installed.`);
@@ -448,9 +462,10 @@ function escapeRegExp(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 
-function parseBundledCatalog({ platform = process.platform, spawn = spawnSync } = {}) {
+function parseBundledCatalog({ platform = process.platform, env = process.env, spawn = spawnSync } = {}) {
   const command = executableName("codex", platform);
-  const result = spawn(command, ["debug", "models", "--bundled"], { encoding: "utf8", shell: platform === "win32" });
+  const launch = commandLaunch(command, ["debug", "models", "--bundled"], { platform, env });
+  const result = spawn(launch.command, launch.args, { encoding: "utf8", env, shell: launch.shell });
   if (result.status !== 0 || !result.stdout) throw new Error("Codex CLI is required to build its 4YI model catalog. Install Codex, then run this command again.");
   const catalog = JSON.parse(result.stdout);
   const template = catalog.models?.find((model) => model.slug === "gpt-5.5") || catalog.models?.[0];
@@ -693,6 +708,7 @@ export const __testing = {
   buildCodexCatalog,
   checkCodex,
   commandAvailable,
+  commandLaunch,
   desktopAppCandidates,
   ensureToolCli,
   executableName,