poe-code 3.0.208 → 3.0.210

package/dist/cli/commands/shared.js

@@ -135,7 +135,7 @@ export function formatServiceList(names) {
 }
 export function buildResumeCommand(canonicalService, threadId, cwd) {
     const spawnConfig = getSpawnConfig(canonicalService);
-    if (spawnConfig?.kind !== "cli" || !spawnConfig.resumeCommand) {
+    if (spawnConfig?.kind !== "cli" || !spawnConfig.resume) {
         return undefined;
     }
     const resolvedId = resolveAgentId(canonicalService) ?? canonicalService;
@@ -145,7 +145,8 @@ export function buildResumeCommand(canonicalService, threadId, cwd) {
         return undefined;
     }
     const resumeCwd = path.resolve(cwd);
-    const args = spawnConfig.resumeCommand(threadId, resumeCwd);
+    const composer = spawnConfig.resume.hintArgs ?? spawnConfig.resume.args;
+    const args = composer(threadId, resumeCwd);
     const agentCommand = [binaryName, ...args.map(shlexQuote)].join(" ");
     const needsCdPrefix = !args.includes(resumeCwd);
     return needsCdPrefix

package/dist/cli/commands/shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../src/cli/commands/shared.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../src/cli/commands/shared.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -7950,7 +7950,9 @@ var init_claude_code2 = __esm({
       interactive: {
         defaultArgs: []
       },
-      resumeCommand: (threadId) => ["--resume", threadId]
+      resume: {
+        args: (threadId) => ["--resume", threadId]
+      }
     };
   }
 });
@@ -7984,7 +7986,11 @@ var init_codex2 = __esm({
       interactive: {
         defaultArgs: ["-a", "never"]
       },
-      resumeCommand: (threadId, cwd) => ["resume", "-C", cwd, threadId]
+      resume: {
+        args: (threadId) => ["resume", threadId],
+        position: "beforePrompt",
+        hintArgs: (threadId, cwd) => ["resume", "-C", cwd, threadId]
+      }
     };
   }
 });
@@ -8018,7 +8024,10 @@ var init_opencode2 = __esm({
         defaultArgs: [],
         promptFlag: "--prompt"
       },
-      resumeCommand: (threadId, cwd) => [cwd, "--session", threadId],
+      resume: {
+        args: (threadId) => ["--session", threadId],
+        hintArgs: (threadId, cwd) => [cwd, "--session", threadId]
+      },
       mcpEnv: serializeOpenCodeMcpEnv
     };
     openCodeAcpSpawnConfig = {
@@ -8061,7 +8070,9 @@ var init_kimi2 = __esm({
         defaultArgs: [],
         promptFlag: "-p"
       },
-      resumeCommand: (threadId, cwd) => ["--session", threadId, "--work-dir", cwd]
+      resume: {
+        args: (threadId, cwd) => ["--session", threadId, "--work-dir", cwd]
+      }
     };
     kimiAcpSpawnConfig = {
       kind: "acp",
@@ -8102,7 +8113,10 @@ var init_goose2 = __esm({
         defaultArgs: ["session"],
         defaultArgsPosition: "beforePrompt"
       },
-      resumeCommand: () => ["run", "--resume", "--text", "continue"]
+      resume: {
+        args: (threadId) => ["--resume", "--session-id", threadId],
+        hintArgs: (threadId) => ["run", "--resume", "--session-id", threadId, "--text", "continue"]
+      }
     };
     gooseAcpSpawnConfig = {
       kind: "acp",
@@ -8289,8 +8303,10 @@ function getMcpArgsPosition(config) {
 }
 function buildCliArgs(config, options, stdinMode) {
   const mcpArgs = getMcpArgs(config, options.mcpServers);
+  const resumeArgs = getResumeArgs(config, options);
   const defaultArgsPosition = getDefaultArgsPosition(config);
   const mcpArgsPosition = getMcpArgsPosition(config);
+  const resumeArgsPosition = config.resume?.position ?? "afterPrompt";
   const args = [];
   if (mcpArgsPosition === "beforeCommand") {
     args.push(...mcpArgs);
@@ -8302,13 +8318,17 @@ function buildCliArgs(config, options, stdinMode) {
     args.push(...mcpArgs);
   }
   if (stdinMode) {
-    args.push(
-      config.promptFlag,
-      ...stdinMode.omitPrompt ? [] : [options.prompt],
-      ...stdinMode.extraArgs
-    );
+    args.push(config.promptFlag);
+    if (resumeArgsPosition === "beforePrompt") {
+      args.push(...resumeArgs);
+    }
+    args.push(...stdinMode.omitPrompt ? [] : [options.prompt], ...stdinMode.extraArgs);
   } else {
-    args.push(config.promptFlag, options.prompt);
+    args.push(config.promptFlag);
+    if (resumeArgsPosition === "beforePrompt") {
+      args.push(...resumeArgs);
+    }
+    args.push(options.prompt);
   }
   if (options.model && config.modelFlag) {
     let model = config.modelStripProviderPrefix ? stripModelNamespace(options.model) : options.model;
@@ -8324,10 +8344,24 @@ function buildCliArgs(config, options, stdinMode) {
   const mode = resolveModeConfig(config.modes[options.mode ?? "yolo"]);
   args.push(...mode.args);
   if (options.args && options.args.length > 0) {
+    if (resumeArgsPosition === "afterPrompt") {
+      args.push(...resumeArgs);
+    }
     args.push(...options.args);
+  } else if (resumeArgsPosition === "afterPrompt") {
+    args.push(...resumeArgs);
   }
   return { args, env: mode.env };
 }
+function getResumeArgs(config, options) {
+  if (!options.resumeThreadId) {
+    return [];
+  }
+  if (!config.resume) {
+    throw new Error(`Agent "${config.agentId}" does not support resumeThreadId.`);
+  }
+  return config.resume.args(options.resumeThreadId, options.cwd ?? process.cwd());
+}
 function buildSpawnArgs(agentId, options) {
   const { binaryName, spawnConfig } = resolveCliConfig(agentId);
   const stdinMode = options.useStdin && spawnConfig.stdinMode ? spawnConfig.stdinMode : void 0;
@@ -8476,15 +8510,29 @@ async function spawnInteractive(agentId, options) {
   }
   const { interactive } = spawnConfig;
   const args = [];
+  if (options.resumeThreadId && !spawnConfig.resume) {
+    throw new Error(`Agent "${resolved.agentId}" does not support resumeThreadId.`);
+  }
+  const resumeArgs = options.resumeThreadId ? spawnConfig.resume.args(options.resumeThreadId, options.cwd ?? process.cwd()) : [];
+  const resumeArgsPosition = spawnConfig.resume?.position ?? "afterPrompt";
   if (interactive.defaultArgsPosition === "beforePrompt") {
     args.push(...interactive.defaultArgs);
   }
   if (options.prompt) {
     if (interactive.promptFlag) {
-      args.push(interactive.promptFlag, options.prompt);
+      args.push(interactive.promptFlag);
+      if (resumeArgsPosition === "beforePrompt") {
+        args.push(...resumeArgs);
+      }
+      args.push(options.prompt);
     } else {
+      if (resumeArgsPosition === "beforePrompt") {
+        args.push(...resumeArgs);
+      }
       args.push(options.prompt);
     }
+  } else if (resumeArgsPosition === "beforePrompt") {
+    args.push(...resumeArgs);
   }
   if (options.model && spawnConfig.modelFlag) {
     let model = spawnConfig.modelStripProviderPrefix ? stripModelNamespace(options.model) : options.model;
@@ -8497,6 +8545,9 @@ async function spawnInteractive(agentId, options) {
   args.push(...getMcpArgs(spawnConfig, options.mcpServers));
   const modeResolved = resolveModeConfig(spawnConfig.modes[options.mode ?? "yolo"]);
   args.push(...modeResolved.args);
+  if (resumeArgsPosition === "afterPrompt") {
+    args.push(...resumeArgs);
+  }
   if (options.args && options.args.length > 0) {
     args.push(...options.args);
   }
@@ -17838,6 +17889,15 @@ function getMcpArgsPosition2(config) {
   }
   return config.mcpArgsBeforeCommand ? "beforeCommand" : "afterCommand";
 }
+function getResumeArgs2(config, options) {
+  if (!options.resumeThreadId) {
+    return [];
+  }
+  if (!config.resume) {
+    throw new Error(`Agent "${config.agentId}" does not support resumeThreadId.`);
+  }
+  return config.resume.args(options.resumeThreadId, options.cwd ?? process.cwd());
+}
 function spawnStreaming(options) {
   if (options.signal?.aborted) {
     throw createAbortError4();
@@ -17854,8 +17914,10 @@ function spawnStreaming(options) {
   }
   const mcpArgs = getMcpArgs(spawnConfig, options.mcpServers);
   const mcpEnvVars = getMcpEnv(spawnConfig, options.mcpServers);
+  const resumeArgs = getResumeArgs2(spawnConfig, options);
   const defaultArgsPosition = getDefaultArgsPosition2(spawnConfig);
   const mcpArgsPosition = getMcpArgsPosition2(spawnConfig);
+  const resumeArgsPosition = spawnConfig.resume?.position ?? "afterPrompt";
   const args = [];
   if (mcpArgsPosition === "beforeCommand") {
     args.push(...mcpArgs);
@@ -17867,6 +17929,9 @@ function spawnStreaming(options) {
     args.push(...mcpArgs);
   }
   args.push(spawnConfig.promptFlag);
+  if (resumeArgsPosition === "beforePrompt") {
+    args.push(...resumeArgs);
+  }
   const useStdin = !!options.useStdin && !!spawnConfig.stdinMode;
   if (!useStdin || !spawnConfig.stdinMode?.omitPrompt) {
     args.push(options.prompt);
@@ -17888,7 +17953,12 @@ function spawnStreaming(options) {
     args.push(...spawnConfig.stdinMode.extraArgs);
   }
   if (options.args && options.args.length > 0) {
+    if (resumeArgsPosition === "afterPrompt") {
+      args.push(...resumeArgs);
+    }
     args.push(...options.args);
+  } else if (resumeArgsPosition === "afterPrompt") {
+    args.push(...resumeArgs);
   }
   const envOverrides = { ...mcpEnvVars, ...modeResolved.env };
   const processEnv = Object.keys(envOverrides).length > 0 ? { ...process.env, ...envOverrides } : void 0;
@@ -18072,8 +18142,15 @@ function spawnAcp(options) {
       if (initResult.authMethods && initResult.authMethods.length > 0 && client.state !== "ready") {
         await client.authenticate(initResult.authMethods[0].id);
       }
-      const session = await client.newSession(options.cwd ?? process.cwd(), toAcpMcpServers(options.mcpServers));
-      sessionId = session.sessionId;
+      const cwd = options.cwd ?? process.cwd();
+      const mcpServers = toAcpMcpServers(options.mcpServers);
+      if (options.resumeThreadId) {
+        await client.loadSession(options.resumeThreadId, cwd, mcpServers);
+        sessionId = options.resumeThreadId;
+      } else {
+        const session = await client.newSession(cwd, mcpServers);
+        sessionId = session.sessionId;
+      }
       pushEvent({ event: "session_start", threadId: sessionId });
       const turn = client.prompt(sessionId, [{ type: "text", text: options.prompt }]);
       for await (const notification of turn) {
@@ -34548,7 +34625,7 @@ function formatServiceList(names) {
 }
 function buildResumeCommand(canonicalService, threadId, cwd) {
   const spawnConfig = getSpawnConfig(canonicalService);
-  if (spawnConfig?.kind !== "cli" || !spawnConfig.resumeCommand) {
+  if (spawnConfig?.kind !== "cli" || !spawnConfig.resume) {
     return void 0;
   }
   const resolvedId = resolveAgentId(canonicalService) ?? canonicalService;
@@ -34558,7 +34635,8 @@ function buildResumeCommand(canonicalService, threadId, cwd) {
     return void 0;
   }
   const resumeCwd = path42.resolve(cwd);
-  const args = spawnConfig.resumeCommand(threadId, resumeCwd);
+  const composer = spawnConfig.resume.hintArgs ?? spawnConfig.resume.args;
+  const args = composer(threadId, resumeCwd);
   const agentCommand = [binaryName, ...args.map(shlexQuote)].join(" ");
   const needsCdPrefix = !args.includes(resumeCwd);
   return needsCdPrefix ? `cd ${shlexQuote(resumeCwd)} && ${agentCommand}` : agentCommand;
@@ -35059,6 +35137,7 @@ async function spawnCore(container, service, options, flags = { dryRun: false, v
       model,
       mode: options.mode,
       mcpServers: options.mcpServers,
+      resumeThreadId: options.resumeThreadId,
       cwd: cwdOverride,
       useStdin: options.useStdin ?? false
     };
@@ -35457,6 +35536,212 @@ var init_check_auth = __esm({
   }
 });
 
+// packages/poe-oauth/src/authorization-state.ts
+import crypto5 from "node:crypto";
+function parseAuthorizationState2(value) {
+  if (value === null || value.length === 0) {
+    return null;
+  }
+  try {
+    const decoded = Buffer.from(value, "base64url").toString("utf8");
+    const parsed = JSON.parse(decoded);
+    if (parsed.v !== 1 || typeof parsed.n !== "string" || parsed.n.length === 0 || typeof parsed.i !== "string" || parsed.i.length === 0 || typeof parsed.r !== "boolean") {
+      return null;
+    }
+    return {
+      issuer: parsed.i,
+      requireIssuer: parsed.r
+    };
+  } catch {
+    return null;
+  }
+}
+var init_authorization_state2 = __esm({
+  "packages/poe-oauth/src/authorization-state.ts"() {
+    "use strict";
+  }
+});
+
+// packages/poe-oauth/src/loopback-authorization.ts
+import http2 from "node:http";
+async function createLoopbackAuthorizationSession2(options = {}) {
+  const callbackPath = options.callbackPath ?? "/callback";
+  const server = options.createServer ? options.createServer() : http2.createServer();
+  const port = await startServer2(server);
+  const redirectUri = `http://127.0.0.1:${port}${callbackPath}`;
+  return {
+    redirectUri,
+    async waitForCode(authorizationUrl) {
+      return waitForAuthorizationCode2(server, authorizationUrl, options, callbackPath);
+    },
+    close() {
+      server.closeAllConnections?.();
+      server.close();
+    }
+  };
+}
+async function startServer2(server) {
+  return new Promise((resolve2) => {
+    server.listen(0, "127.0.0.1", () => {
+      const address = server.address();
+      resolve2(address.port);
+    });
+  });
+}
+function waitForAuthorizationCode2(server, authorizationUrl, options, callbackPath) {
+  const expectedAuthorization = readExpectedAuthorizationCallback2(authorizationUrl);
+  return new Promise((resolve2, reject) => {
+    let settled = false;
+    const settle = (fn) => {
+      if (!settled) {
+        settled = true;
+        fn();
+      }
+    };
+    server.on("request", (req, res) => {
+      const url = new URL(req.url ?? "/", "http://127.0.0.1");
+      if (url.pathname !== callbackPath) {
+        res.writeHead(404);
+        res.end("Not found");
+        return;
+      }
+      const error2 = url.searchParams.get("error");
+      if (error2 !== null) {
+        const description = url.searchParams.get("error_description") ?? error2;
+        res.writeHead(400);
+        res.end(`Authorization failed: ${description}`);
+        settle(() => reject(new Error(`OAuth authorization failed: ${error2} \u2014 ${description}`)));
+        return;
+      }
+      try {
+        const code = validateAuthorizationCallbackParameters2({
+          code: url.searchParams.get("code"),
+          state: url.searchParams.get("state"),
+          iss: url.searchParams.get("iss")
+        }, expectedAuthorization);
+        res.writeHead(200, { "Content-Type": "text/html" });
+        res.end(buildSuccessPage2(options.landingPage));
+        settle(() => resolve2(code));
+      } catch (error3) {
+        res.writeHead(400);
+        res.end(error3 instanceof Error ? error3.message : "Invalid OAuth callback");
+        settle(() => reject(error3 instanceof Error ? error3 : new Error(String(error3))));
+      }
+    });
+    if (options.readLine !== void 0) {
+      options.readLine().then((input) => {
+        const callbackParameters = extractCallbackParametersFromInput2(input);
+        if (callbackParameters === null) {
+          settle(() => reject(new Error("OAuth callback missing authorization code")));
+          return;
+        }
+        try {
+          const code = validateAuthorizationCallbackParameters2(
+            callbackParameters,
+            expectedAuthorization
+          );
+          settle(() => resolve2(code));
+        } catch (error2) {
+          settle(() => reject(error2 instanceof Error ? error2 : new Error(String(error2))));
+        }
+      }).catch(() => void 0);
+    }
+    if (options.openBrowser !== void 0) {
+      options.openBrowser(authorizationUrl).catch((error2) => {
+        settle(() => reject(error2));
+      });
+    }
+  });
+}
+function extractCallbackParametersFromInput2(input) {
+  const trimmed = input.replaceAll("\r", "").replaceAll("\n", "").trim();
+  if (trimmed.length === 0) {
+    return null;
+  }
+  try {
+    const url = new URL(trimmed);
+    return {
+      code: url.searchParams.get("code"),
+      state: url.searchParams.get("state"),
+      iss: url.searchParams.get("iss")
+    };
+  } catch {
+    return {
+      code: trimmed,
+      state: null,
+      iss: null
+    };
+  }
+}
+function readExpectedAuthorizationCallback2(authorizationUrl) {
+  const url = new URL(authorizationUrl);
+  const state = url.searchParams.get("state");
+  const parsedState = parseAuthorizationState2(state);
+  return {
+    state,
+    issuer: parsedState?.issuer ?? null,
+    requireIssuer: parsedState?.requireIssuer ?? false
+  };
+}
+function validateAuthorizationCallbackParameters2(callback, expected) {
+  if (callback.code === null || callback.code.length === 0) {
+    throw new Error("OAuth callback missing authorization code");
+  }
+  if (expected.state !== null) {
+    if (callback.state === null || callback.state.length === 0) {
+      throw new Error("OAuth callback missing state");
+    }
+    if (callback.state !== expected.state) {
+      throw new Error("OAuth callback state mismatch");
+    }
+  }
+  if (expected.requireIssuer) {
+    if (callback.iss === null || callback.iss.length === 0) {
+      throw new Error("OAuth callback missing issuer");
+    }
+  }
+  if (callback.iss !== null && callback.iss.length > 0 && expected.issuer !== null && callback.iss !== expected.issuer) {
+    throw new Error("OAuth callback issuer mismatch");
+  }
+  return callback.code;
+}
+function escapeHtml2(text5) {
+  return text5.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;");
+}
+function buildSuccessPage2(landingPage) {
+  const title = landingPage?.title ?? "Connected";
+  const body = landingPage?.body ?? "You can close this tab and return to your terminal.";
+  return [
+    "<!DOCTYPE html>",
+    `<html><head><meta charset=utf-8><title>${escapeHtml2(title)}</title></head>`,
+    '<body style="font-family:system-ui,sans-serif;display:flex;align-items:center;justify-content:center;min-height:100vh;margin:0">',
+    '<div style="text-align:center">',
+    `<h1>${escapeHtml2(title)}</h1>`,
+    `<p style="color:#666">${escapeHtml2(body)}</p>`,
+    "</div></body></html>"
+  ].join("");
+}
+var init_loopback_authorization2 = __esm({
+  "packages/poe-oauth/src/loopback-authorization.ts"() {
+    "use strict";
+    init_authorization_state2();
+  }
+});
+
+// packages/poe-oauth/src/pkce.ts
+import crypto6 from "node:crypto";
+function generateCodeVerifier2() {
+  return crypto6.randomBytes(32).toString("base64url");
+}
+function generateCodeChallenge2(verifier) {
+  return crypto6.createHash("sha256").update(verifier).digest("base64url");
+}
+var init_pkce2 = __esm({
+  "packages/poe-oauth/src/pkce.ts"() {
+    "use strict";
+  }
+});
+
 // packages/poe-oauth/src/oauth-client.ts
 function createOAuthClient(config) {
   const fetchFn = config.fetch ?? globalThis.fetch;
@@ -35464,15 +35749,15 @@ function createOAuthClient(config) {
     authorize: () => startAuthorization(config, fetchFn)
   };
 }
-function generateCodeVerifier2() {
-  return generateCodeVerifier();
+function generateCodeVerifier3() {
+  return generateCodeVerifier2();
 }
 async function startAuthorization(config, fetchFn) {
   const authorizationEndpoint = config.authorizationEndpoint ?? DEFAULT_AUTHORIZATION_ENDPOINT;
   const tokenEndpoint = config.tokenEndpoint ?? DEFAULT_TOKEN_ENDPOINT;
-  const codeVerifier = generateCodeVerifier2();
-  const codeChallenge = generateCodeChallenge(codeVerifier);
-  const loopbackSession = await createLoopbackAuthorizationSession({
+  const codeVerifier = generateCodeVerifier3();
+  const codeChallenge = generateCodeChallenge2(codeVerifier);
+  const loopbackSession = await createLoopbackAuthorizationSession2({
     openBrowser: config.openBrowser,
     readLine: config.readLine,
     createServer: config.createServer,
@@ -35559,7 +35844,8 @@ var DEFAULT_AUTHORIZATION_ENDPOINT, DEFAULT_TOKEN_ENDPOINT;
 var init_oauth_client = __esm({
   "packages/poe-oauth/src/oauth-client.ts"() {
     "use strict";
-    init_dist();
+    init_loopback_authorization2();
+    init_pkce2();
     DEFAULT_AUTHORIZATION_ENDPOINT = "https://poe.com/oauth/authorize";
     DEFAULT_TOKEN_ENDPOINT = "https://api.poe.com/token";
   }
@@ -36934,6 +37220,7 @@ function spawn8(service, promptOrOptions, maybeOptions) {
           mode: options.mode,
           signal: options.signal,
           args: options.args,
+          resumeThreadId: options.resumeThreadId,
           runtimeConfigCwd: options.runtimeConfigCwd,
           ...runtimeOverrides,
           ...resolvedMcpServers ? { mcpServers: resolvedMcpServers } : {}
@@ -36955,6 +37242,7 @@ function spawn8(service, promptOrOptions, maybeOptions) {
           model: model2,
           mode: options.mode,
           mcpServers: options.mcpServers,
+          resumeThreadId: options.resumeThreadId,
           signal: options.signal,
           ...runtimeOverrides
         });
@@ -37000,6 +37288,7 @@ function spawn8(service, promptOrOptions, maybeOptions) {
           model: model2,
           mode: options.mode,
           args: options.args,
+          resumeThreadId: options.resumeThreadId,
           signal: options.signal,
           runtimeConfigCwd: options.runtimeConfigCwd,
           ...runtimeOverrides,
@@ -37049,6 +37338,7 @@ function spawn8(service, promptOrOptions, maybeOptions) {
           model: model2,
           mode: options.mode,
           args: options.args,
+          resumeThreadId: options.resumeThreadId,
           signal: options.signal,
           runtimeConfigCwd: options.runtimeConfigCwd,
           ...runtimeOverrides,
@@ -37068,6 +37358,7 @@ function spawn8(service, promptOrOptions, maybeOptions) {
         model,
         mode: options.mode,
         args: options.args,
+        resumeThreadId: options.resumeThreadId,
         ...runtimeOverrides,
         ...resolvedMcpServers ? { mcpServers: resolvedMcpServers } : {},
         useStdin: options.useStdin ?? false
@@ -81069,7 +81360,7 @@ var init_package2 = __esm({
   "package.json"() {
     package_default2 = {
       name: "poe-code",
-      version: "3.0.208",
+      version: "3.0.210",
       description: "CLI tool to configure Poe API for developer workflows.",
       type: "module",
       main: "./dist/index.js",