linkshell-cli 0.3.5 → 0.3.7

package/src/runtime/acp/agent-workspace.ts

@@ -9,6 +9,8 @@ import {
 import { AcpClient } from "./acp-client.js";
 import { ClaudeSdkClient } from "./claude-sdk-client.js";
 import { ClaudeStreamJsonClient } from "./claude-stream-json-client.js";
+import { listClaudeStoredSessions } from "./claude-sessions.js";
+import { listCodexStoredSessions } from "./codex-sessions.js";
 import type { AgentProtocol, AgentProvider } from "./provider-resolver.js";
 import { resolveAgentCommand } from "./provider-resolver.js";
 
@@ -1161,6 +1163,7 @@ function parseRemoteSessions(value: unknown): Array<{
   model?: string;
   createdAt?: number;
   lastActivityAt?: number;
+  archived?: boolean;
 }> {
   const raw = asRecord(value);
   const sessionsValue =
@@ -1176,6 +1179,7 @@ function parseRemoteSessions(value: unknown): Array<{
     model?: string;
     createdAt?: number;
     lastActivityAt?: number;
+    archived?: boolean;
   }> = [];
   for (const entry of sessionsValue) {
     const session = asRecord(entry);
@@ -1194,6 +1198,7 @@ function parseRemoteSessions(value: unknown): Array<{
       model: firstString(source, ["model", "modelId"]),
       createdAt: parseTimestamp(source.createdAt ?? source.created_at),
       lastActivityAt: parseTimestamp(source.lastActivityAt ?? source.updatedAt ?? source.modifiedAt ?? source.lastModified ?? source.updated_at),
+      archived: typeof source.archived === "boolean" ? source.archived : undefined,
     });
   }
   return result;
@@ -1437,36 +1442,12 @@ export class AgentWorkspaceProxy {
 
   private async syncProviderSessions(): Promise<void> {
     await this.initialize();
+    this.upsertProviderSessions("codex", listCodexStoredSessions(this.input.cwd));
+    this.upsertProviderSessions("claude", listClaudeStoredSessions(this.input.cwd));
     for (const [provider, client] of this.clients) {
       try {
         const result = await client.listSessions();
-        for (const remote of parseRemoteSessions(result)) {
-          const agentSessionId = remote.id;
-          const existingId = this.conversationByAgentSessionId.get(agentSessionId);
-          const now = Date.now();
-          const conversationId = existingId ?? `agent:${agentSessionId}`;
-          const existing = this.conversations.get(conversationId);
-          const cwd = remote.cwd ?? existing?.cwd ?? this.input.cwd;
-          const conversation: AgentConversation = {
-            id: conversationId,
-            agentSessionId,
-            provider,
-            cwd,
-            title: remote.title ?? existing?.title ?? titleFromCwd(cwd),
-            model: remote.model ?? existing?.model,
-            reasoningEffort: existing?.reasoningEffort,
-            permissionMode: existing?.permissionMode,
-            collaborationMode: existing?.collaborationMode,
-            status: existing?.status ?? "idle",
-            archived: existing?.archived ?? false,
-            lastMessagePreview: existing?.lastMessagePreview,
-            lastActivityAt: remote.lastActivityAt ?? existing?.lastActivityAt ?? now,
-            createdAt: remote.createdAt ?? existing?.createdAt ?? now,
-          };
-          this.conversations.set(conversation.id, conversation);
-          this.conversationByAgentSessionId.set(agentSessionId, conversation.id);
-          this.timelines.set(conversation.id, this.timelines.get(conversation.id) ?? []);
-        }
+        this.upsertProviderSessions(provider, result);
       } catch (error) {
         if (this.input.verbose) {
           process.stderr.write(`[agent:v2] session list failed for ${provider}: ${error instanceof Error ? error.message : String(error)}\n`);
@@ -1475,6 +1456,36 @@ export class AgentWorkspaceProxy {
     }
   }
 
+  private upsertProviderSessions(provider: AgentProvider, result: unknown): void {
+    for (const remote of parseRemoteSessions(result)) {
+      const agentSessionId = remote.id;
+      const existingId = this.conversationByAgentSessionId.get(agentSessionId);
+      const now = Date.now();
+      const conversationId = existingId ?? `agent:${agentSessionId}`;
+      const existing = this.conversations.get(conversationId);
+      const cwd = remote.cwd ?? existing?.cwd ?? this.input.cwd;
+      const conversation: AgentConversation = {
+        id: conversationId,
+        agentSessionId,
+        provider,
+        cwd,
+        title: remote.title ?? existing?.title ?? titleFromCwd(cwd),
+        model: remote.model ?? existing?.model,
+        reasoningEffort: existing?.reasoningEffort,
+        permissionMode: existing?.permissionMode,
+        collaborationMode: existing?.collaborationMode,
+        status: existing?.status ?? "idle",
+        archived: remote.archived ?? existing?.archived ?? false,
+        lastMessagePreview: existing?.lastMessagePreview,
+        lastActivityAt: remote.lastActivityAt ?? existing?.lastActivityAt ?? now,
+        createdAt: remote.createdAt ?? existing?.createdAt ?? now,
+      };
+      this.conversations.set(conversation.id, conversation);
+      this.conversationByAgentSessionId.set(agentSessionId, conversation.id);
+      this.timelines.set(conversation.id, this.timelines.get(conversation.id) ?? []);
+    }
+  }
+
   private sendCapabilities(): void {
     const providers = this.input.availableProviders.map((provider) => {
       const client = this.clients.get(provider);

package/src/runtime/acp/codex-sessions.ts

@@ -11,6 +11,7 @@ export interface CodexStoredSession {
   title?: string;
   createdAt?: number;
   lastModified: number;
+  archived?: boolean;
 }
 
 interface CodexIndexEntry {
@@ -158,15 +159,15 @@ function readCodexSessionFile(filePath: string, fallbackCwd: string): Omit<Codex
   };
 }
 
-function collectJsonlFiles(dir: string, result: string[]): void {
+function collectJsonlFiles(dir: string, result: Array<{ path: string; archived: boolean }>, archived: boolean): void {
   if (!existsSync(dir)) return;
   try {
     for (const entry of readdirSync(dir, { withFileTypes: true })) {
       const path = join(dir, entry.name);
       if (entry.isDirectory()) {
-        collectJsonlFiles(path, result);
+        collectJsonlFiles(path, result, archived);
       } else if (entry.isFile() && entry.name.endsWith(".jsonl")) {
-        result.push(path);
+        result.push({ path, archived });
       }
     }
   } catch {
@@ -179,13 +180,13 @@ export function listCodexStoredSessions(inputCwd: string): { sessions: CodexStor
   if (!existsSync(root)) return { sessions: [] };
 
   const index = loadSessionIndex(root);
-  const files: string[] = [];
-  collectJsonlFiles(join(root, "sessions"), files);
-  collectJsonlFiles(join(root, "archived_sessions"), files);
+  const files: Array<{ path: string; archived: boolean }> = [];
+  collectJsonlFiles(join(root, "sessions"), files, false);
+  collectJsonlFiles(join(root, "archived_sessions"), files, true);
 
   const sessionsById = new Map<string, CodexStoredSession>();
   for (const file of files) {
-    const metadata = readCodexSessionFile(file, inputCwd);
+    const metadata = readCodexSessionFile(file.path, inputCwd);
     if (!metadata) continue;
     const indexed = index.get(metadata.id);
     const session: CodexStoredSession = {
@@ -194,9 +195,10 @@ export function listCodexStoredSessions(inputCwd: string): { sessions: CodexStor
       title: indexed?.title,
       createdAt: metadata.createdAt,
       lastModified: indexed?.updatedAt ?? metadata.lastModified ?? Date.now(),
+      archived: file.archived,
     };
     const existing = sessionsById.get(session.id);
-    if (!existing || session.lastModified > existing.lastModified) {
+    if (!existing || session.lastModified > existing.lastModified || session.archived) {
       sessionsById.set(session.id, session);
     }
   }
@@ -208,6 +210,7 @@ export function listCodexStoredSessions(inputCwd: string): { sessions: CodexStor
       cwd: resolve(inputCwd),
       title: indexed.title,
       lastModified: indexed.updatedAt ?? Date.now(),
+      archived: false,
     });
   }