@ycodium-ai/plugin-session-import 0.2.2106 → 0.2.2143

package/dist/index.js

@@ -509,10 +509,18 @@ async function openCodexAppServer(input) {
     const settled = new Promise((resolve, reject) => {
       pending.set(id, { resolve, reject, method });
     });
-    await handle.writeStdin(
-      `${JSON.stringify({ id, method, ...params === void 0 ? {} : { params } })}
+    try {
+      await Promise.race([
+        handle.writeStdin(
+          `${JSON.stringify({ id, method, ...params === void 0 ? {} : { params } })}
 `
-    );
+        ),
+        settled
+      ]);
+    } catch (error) {
+      pending.delete(id);
+      throw error;
+    }
     let timer;
     try {
       return await Promise.race([
@@ -553,7 +561,7 @@ async function openCodexAppServer(input) {
     await close();
     throw error;
   }
-  return { request, notify, close };
+  return { request, notify, close, pendingCountForTests: () => pending.size };
 }
 
 // src/codexSessionScan.ts
@@ -1419,6 +1427,19 @@ async function withCodex(ctx, instance, use) {
     await client.close();
   }
 }
+async function nativeSessionsOf(ctx, instanceId) {
+  const resolve = ctx.providers.nativeSessions;
+  if (typeof resolve !== "function") return null;
+  try {
+    return await resolve(instanceId);
+  } catch (error) {
+    ctx.log.warn("session-import could not reach the executor's own session scan", {
+      instanceId,
+      detail: describeError(error)
+    });
+    return null;
+  }
+}
 async function listSessions(ctx, input) {
   const project = await ctx.projections.getProject(input.projectId);
   if (project === null) {
@@ -1432,6 +1453,50 @@ async function listSessions(ctx, input) {
   const scannedKeys = /* @__PURE__ */ new Set();
   for (const instance of instances) {
     if (!instance.enabled) continue;
+    const provider = providerKindOfDriver(instance.driver);
+    if (provider === void 0) continue;
+    const hand = await nativeSessionsOf(ctx, instance.instanceId);
+    if (hand !== null) {
+      const scanKey2 = `hand:${instance.driver}:${instance.homePath ?? instance.instanceId}`;
+      if (scannedKeys.has(scanKey2)) continue;
+      scannedKeys.add(scanKey2);
+      try {
+        const scanned = await hand.scan({ projectId: input.projectId, directory });
+        sources.push({
+          instanceId: instance.instanceId,
+          provider,
+          candidates: scanned.candidates.map(
+            (row) => candidateOf({
+              provider,
+              instanceId: instance.instanceId,
+              nativeSessionId: row.nativeSessionId,
+              cwd: row.cwd,
+              title: row.title,
+              preview: row.preview,
+              model: row.model,
+              turnCount: row.turnCount,
+              updatedAt: row.updatedAt,
+              openElsewhere: row.openElsewhere,
+              // 「已经有 thread 绑着它」是宿主的账，手报不出来，一律盖上去。
+              importedThreadId: imported.get(importedThreadKey(provider, row.nativeSessionId))
+            })
+          ),
+          unavailableReason: null
+        });
+      } catch (error) {
+        ctx.log.warn("session-import could not read sessions from the executor", {
+          instanceId: instance.instanceId,
+          detail: describeError(error)
+        });
+        sources.push({
+          instanceId: instance.instanceId,
+          provider,
+          candidates: [],
+          unavailableReason: provider === "codex" ? "Codex sessions could not be read." : "Claude sessions could not be read."
+        });
+      }
+      continue;
+    }
     if (instance.driver === CODEX_DRIVER) {
       const binaryPath = ctx.config.codexBinaries?.[instance.instanceId];
       if (binaryPath === void 0) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/plugin-session-import",
-  "version": "0.2.2106",
+  "version": "0.2.2143",
   "description": "Brings a session you started in a terminal into Ycodium.",
   "keywords": [
     "session-import",
@@ -20,7 +20,7 @@
     "effect": "4.0.0-beta.103",
     "esbuild": "0.28.1",
     "vite-plus": "0.2.2",
-    "@ycodium-ai/plugin-api": "0.2.2106"
+    "@ycodium-ai/plugin-api": "0.2.2143"
   },
   "ycodium": {
     "plugin": "./dist/index.js",