@love-moon/ai-sdk 0.2.29 → 0.2.31

package/dist/providers/opencode-sdk-session.js

@@ -200,10 +200,14 @@ export class OpencodeSdkSession extends EventEmitter {
         return this.sessionId;
     }
     get threadOptions() {
-        const model = typeof this.options.model === "string" && this.options.model.trim()
-            ? this.options.model.trim()
-            : this.backend;
-        return { model };
+        const model = this.sessionInfo?.model ||
+            (typeof this.options.model === "string" && this.options.model.trim()
+                ? this.options.model.trim()
+                : this.backend);
+        return {
+            model,
+            modelProvider: this.sessionInfo?.modelProvider || undefined,
+        };
     }
     getSnapshot() {
         return {
@@ -536,9 +540,20 @@ export class OpencodeSdkSession extends EventEmitter {
         }
         const changed = this.sessionId !== normalizedSessionId;
         this.sessionId = normalizedSessionId;
+        const resolvedModel = typeof this.lastAssistantInfo?.model?.modelID === "string" && this.lastAssistantInfo.model.modelID.trim()
+            ? this.lastAssistantInfo.model.modelID.trim()
+            : typeof this.options.model === "string" && this.options.model.trim()
+                ? this.options.model.trim()
+                : undefined;
+        const resolvedModelProvider = typeof this.lastAssistantInfo?.model?.providerID === "string" && this.lastAssistantInfo.model.providerID.trim()
+            ? this.lastAssistantInfo.model.providerID.trim()
+            : undefined;
         this.sessionInfo = {
+            ...(this.sessionInfo || {}),
             backend: this.backend,
             sessionId: normalizedSessionId,
+            model: resolvedModel,
+            modelProvider: resolvedModelProvider,
         };
         if (changed) {
             this.trace(`session ready id=${normalizedSessionId}`);
@@ -874,6 +889,9 @@ export class OpencodeSdkSession extends EventEmitter {
                 this.activeReplyTarget = "";
                 this.lastUsage = this.buildUsageFromAssistantInfo(currentTurn.lastAssistantInfo);
                 this.lastAssistantInfo = currentTurn.lastAssistantInfo || null;
+                this.applySessionInfo({
+                    id: this.sessionId,
+                });
                 await this.emitTerminalWorkingStatus(currentTurn, {
                     phase: "turn_completed",
                     status_done_line: "opencode finished",

package/dist/resume.d.ts

@@ -0,0 +1,26 @@
+export function resumeProviderForBackend(backend: any): "codex" | "claude" | "copilot" | null;
+export function findSessionPath(provider: any, sessionId: any, options?: {}): Promise<any>;
+export function findCodexSessionPath(sessionId: any, options?: {}): Promise<string | null>;
+export function findClaudeSessionPath(sessionId: any, options?: {}): Promise<any>;
+export function findCopilotSessionPath(sessionId: any, options?: {}): Promise<string | null>;
+export function resolveSessionRunDirectory(sessionPath: any): Promise<string>;
+export function inspectResumeTarget(backend: any, sessionId: any, options?: {}): Promise<{
+    provider: string;
+    sessionId: string;
+    sessionPath: any;
+    cwd: string;
+    debugMetadata: {
+        cwdSource: string;
+        sessionPath: any;
+    };
+}>;
+export function resolveResumeContext(backend: any, sessionId: any, options?: {}): Promise<{
+    provider: string;
+    sessionId: string;
+    sessionPath: any;
+    cwd: string;
+    debugMetadata: {
+        cwdSource: string;
+        sessionPath: any;
+    };
+}>;

package/dist/resume.js

@@ -0,0 +1,380 @@
+import fs from "node:fs";
+import { promises as fsp } from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import readline from "node:readline";
+import yaml from "js-yaml";
+function normalizeBackend(backend) {
+    return String(backend || "").trim().toLowerCase();
+}
+function resolveHomeDir(options) {
+    if (options?.homeDir) {
+        return options.homeDir;
+    }
+    return os.homedir();
+}
+function normalizeSessionId(sessionId) {
+    return typeof sessionId === "string" ? sessionId.trim() : "";
+}
+export function resumeProviderForBackend(backend) {
+    const normalizedBackend = normalizeBackend(backend);
+    if (normalizedBackend === "codex" || normalizedBackend === "code") {
+        return "codex";
+    }
+    if (normalizedBackend === "claude" || normalizedBackend === "claude-code") {
+        return "claude";
+    }
+    if (normalizedBackend === "copilot") {
+        return "copilot";
+    }
+    return null;
+}
+export async function findSessionPath(provider, sessionId, options = {}) {
+    const normalizedProvider = String(provider || "").trim().toLowerCase();
+    if (normalizedProvider === "codex") {
+        return findCodexSessionPath(sessionId, options);
+    }
+    if (normalizedProvider === "claude") {
+        return findClaudeSessionPath(sessionId, options);
+    }
+    if (normalizedProvider === "copilot") {
+        return findCopilotSessionPath(sessionId, options);
+    }
+    throw new Error(`Unsupported provider: ${provider}`);
+}
+export async function findCodexSessionPath(sessionId, options = {}) {
+    const normalizedSessionId = normalizeSessionId(sessionId);
+    if (!normalizedSessionId) {
+        return null;
+    }
+    const homeDir = resolveHomeDir(options);
+    const sessionsDir = options.codexSessionsDir || path.join(homeDir, ".codex", "sessions");
+    return findCodexSessionFile(sessionsDir, normalizedSessionId);
+}
+export async function findClaudeSessionPath(sessionId, options = {}) {
+    const normalizedSessionId = normalizeSessionId(sessionId);
+    if (!normalizedSessionId) {
+        return null;
+    }
+    const homeDir = resolveHomeDir(options);
+    const projectsDir = options.claudeProjectsDir || path.join(homeDir, ".claude", "projects");
+    const sessionEntries = await findClaudeSessionEntries(projectsDir, normalizedSessionId);
+    if (sessionEntries.length > 0) {
+        return sessionEntries[0]?.source || null;
+    }
+    const tasksDir = options.claudeTasksDir || path.join(homeDir, ".claude", "tasks");
+    const directTaskDir = path.join(tasksDir, normalizedSessionId);
+    if (await pathExists(directTaskDir, "directory")) {
+        return directTaskDir;
+    }
+    return null;
+}
+export async function findCopilotSessionPath(sessionId, options = {}) {
+    const normalizedSessionId = normalizeSessionId(sessionId);
+    if (!normalizedSessionId) {
+        return null;
+    }
+    const homeDir = resolveHomeDir(options);
+    const sessionStateDir = options.copilotSessionStateDir || path.join(homeDir, ".copilot", "session-state");
+    const directJsonlPath = path.join(sessionStateDir, `${normalizedSessionId}.jsonl`);
+    if (await pathExists(directJsonlPath, "file")) {
+        return directJsonlPath;
+    }
+    const directSessionDir = path.join(sessionStateDir, normalizedSessionId);
+    if (await pathExists(directSessionDir, "directory")) {
+        return directSessionDir;
+    }
+    return findPathByName(sessionStateDir, normalizedSessionId);
+}
+export async function resolveSessionRunDirectory(sessionPath) {
+    const normalizedPath = typeof sessionPath === "string" ? sessionPath.trim() : "";
+    if (!normalizedPath) {
+        throw new Error("Invalid session path");
+    }
+    let stats;
+    try {
+        stats = await fsp.stat(normalizedPath);
+    }
+    catch {
+        throw new Error(`Session path does not exist: ${normalizedPath}`);
+    }
+    return stats.isDirectory() ? normalizedPath : path.dirname(normalizedPath);
+}
+export async function inspectResumeTarget(backend, sessionId, options = {}) {
+    return resolveResumeContext(backend, sessionId, options);
+}
+export async function resolveResumeContext(backend, sessionId, options = {}) {
+    const normalizedSessionId = normalizeSessionId(sessionId);
+    if (!normalizedSessionId) {
+        throw new Error("--resume requires a session id");
+    }
+    const provider = resumeProviderForBackend(backend);
+    if (!provider) {
+        throw new Error(`--resume is not supported for backend "${backend}"`);
+    }
+    const sessionPath = await findSessionPath(provider, normalizedSessionId, options);
+    if (!sessionPath) {
+        throw new Error(`Invalid --resume session id for ${provider}: ${normalizedSessionId}`);
+    }
+    const cwdFromSession = await extractResumeCwdFromSession(provider, sessionPath, normalizedSessionId);
+    const fallbackCwd = await resolveSessionRunDirectory(sessionPath);
+    const cwd = cwdFromSession || fallbackCwd;
+    if (!(await isExistingDirectory(cwd))) {
+        throw new Error(`Resume workspace path does not exist: ${cwd}`);
+    }
+    return {
+        provider,
+        sessionId: normalizedSessionId,
+        sessionPath,
+        cwd,
+        debugMetadata: {
+            cwdSource: cwdFromSession ? "session" : "session_path",
+            sessionPath,
+        },
+    };
+}
+async function isExistingDirectory(targetPath) {
+    const normalizedPath = typeof targetPath === "string" ? targetPath.trim() : "";
+    if (!normalizedPath) {
+        return false;
+    }
+    try {
+        const stats = await fsp.stat(normalizedPath);
+        return stats.isDirectory();
+    }
+    catch {
+        return false;
+    }
+}
+async function extractCodexResumeCwd(sessionPath) {
+    if (!sessionPath.endsWith(".jsonl")) {
+        return null;
+    }
+    const rl = readline.createInterface({
+        input: fs.createReadStream(sessionPath),
+        crlfDelay: Infinity,
+    });
+    for await (const line of rl) {
+        const trimmed = line.trim();
+        if (!trimmed) {
+            continue;
+        }
+        let entry;
+        try {
+            entry = JSON.parse(trimmed);
+        }
+        catch {
+            continue;
+        }
+        const maybeCwd = entry?.type === "session_meta" ? entry?.payload?.cwd : null;
+        if (typeof maybeCwd === "string" && maybeCwd.trim()) {
+            return maybeCwd.trim();
+        }
+    }
+    return null;
+}
+async function extractClaudeResumeCwd(sessionPath, sessionId) {
+    if (!sessionPath.endsWith(".jsonl")) {
+        return null;
+    }
+    const rl = readline.createInterface({
+        input: fs.createReadStream(sessionPath),
+        crlfDelay: Infinity,
+    });
+    for await (const line of rl) {
+        const trimmed = line.trim();
+        if (!trimmed) {
+            continue;
+        }
+        let entry;
+        try {
+            entry = JSON.parse(trimmed);
+        }
+        catch {
+            continue;
+        }
+        const idMatches = String(entry?.sessionId || "").trim() === sessionId;
+        const maybeCwd = entry?.cwd;
+        if (idMatches && typeof maybeCwd === "string" && maybeCwd.trim()) {
+            return maybeCwd.trim();
+        }
+    }
+    return null;
+}
+async function extractCopilotResumeCwd(sessionPath) {
+    let stats;
+    try {
+        stats = await fsp.stat(sessionPath);
+    }
+    catch {
+        return null;
+    }
+    if (stats.isDirectory()) {
+        const workspaceYamlPath = path.join(sessionPath, "workspace.yaml");
+        try {
+            const yamlContent = await fsp.readFile(workspaceYamlPath, "utf8");
+            const parsed = yaml.load(yamlContent);
+            const maybeCwd = parsed && typeof parsed === "object" ? parsed.cwd : null;
+            if (typeof maybeCwd === "string" && maybeCwd.trim()) {
+                return maybeCwd.trim();
+            }
+        }
+        catch {
+            return null;
+        }
+        return null;
+    }
+    if (!sessionPath.endsWith(".jsonl")) {
+        return null;
+    }
+    const rl = readline.createInterface({
+        input: fs.createReadStream(sessionPath),
+        crlfDelay: Infinity,
+    });
+    for await (const line of rl) {
+        const trimmed = line.trim();
+        if (!trimmed) {
+            continue;
+        }
+        let entry;
+        try {
+            entry = JSON.parse(trimmed);
+        }
+        catch {
+            continue;
+        }
+        const maybeCwd = entry?.data?.context?.cwd || entry?.data?.cwd;
+        if (typeof maybeCwd === "string" && maybeCwd.trim()) {
+            return maybeCwd.trim();
+        }
+    }
+    return null;
+}
+async function extractResumeCwdFromSession(provider, sessionPath, sessionId) {
+    if (provider === "codex") {
+        return extractCodexResumeCwd(sessionPath);
+    }
+    if (provider === "claude") {
+        return extractClaudeResumeCwd(sessionPath, sessionId);
+    }
+    if (provider === "copilot") {
+        return extractCopilotResumeCwd(sessionPath);
+    }
+    return null;
+}
+async function findCodexSessionFile(rootDir, sessionId) {
+    const queue = [rootDir];
+    while (queue.length) {
+        const current = queue.pop();
+        let entries = [];
+        try {
+            entries = await fsp.readdir(current, { withFileTypes: true });
+        }
+        catch {
+            continue;
+        }
+        for (const entry of entries) {
+            const fullPath = path.join(current, entry.name);
+            if (entry.isDirectory()) {
+                queue.push(fullPath);
+            }
+            else if (entry.isFile() &&
+                entry.name.includes(sessionId) &&
+                entry.name.endsWith(".jsonl")) {
+                return fullPath;
+            }
+        }
+    }
+    return null;
+}
+async function findClaudeSessionEntries(projectsDir, sessionId) {
+    const entries = [];
+    let projectDirs = [];
+    try {
+        projectDirs = await fsp.readdir(projectsDir, { withFileTypes: true });
+    }
+    catch {
+        return entries;
+    }
+    for (const projectDir of projectDirs) {
+        if (!projectDir.isDirectory()) {
+            continue;
+        }
+        const projectPath = path.join(projectsDir, projectDir.name);
+        let files = [];
+        try {
+            files = await fsp.readdir(projectPath, { withFileTypes: true });
+        }
+        catch {
+            continue;
+        }
+        for (const file of files) {
+            if (!file.isFile()) {
+                continue;
+            }
+            if (!file.name.endsWith(".jsonl") || file.name.startsWith("agent-")) {
+                continue;
+            }
+            const filePath = path.join(projectPath, file.name);
+            const rl = readline.createInterface({
+                input: fs.createReadStream(filePath),
+                crlfDelay: Infinity,
+            });
+            for await (const line of rl) {
+                const trimmed = line.trim();
+                if (!trimmed) {
+                    continue;
+                }
+                let entry;
+                try {
+                    entry = JSON.parse(trimmed);
+                }
+                catch {
+                    continue;
+                }
+                if (entry.sessionId === sessionId) {
+                    entries.push({ ...entry, source: filePath });
+                }
+            }
+        }
+    }
+    return entries;
+}
+async function findPathByName(rootDir, sessionId) {
+    const queue = [rootDir];
+    while (queue.length) {
+        const current = queue.pop();
+        let entries = [];
+        try {
+            entries = await fsp.readdir(current, { withFileTypes: true });
+        }
+        catch {
+            continue;
+        }
+        for (const entry of entries) {
+            const fullPath = path.join(current, entry.name);
+            if (entry.name.includes(sessionId)) {
+                return fullPath;
+            }
+            if (entry.isDirectory()) {
+                queue.push(fullPath);
+            }
+        }
+    }
+    return null;
+}
+async function pathExists(targetPath, expectedType) {
+    try {
+        const stats = await fsp.stat(targetPath);
+        if (expectedType === "file") {
+            return stats.isFile();
+        }
+        if (expectedType === "directory") {
+            return stats.isDirectory();
+        }
+        return true;
+    }
+    catch {
+        return false;
+    }
+}

package/dist/session-factory.d.ts

@@ -1,8 +1,8 @@
-export function normalizeBackend(backend: any): string;
-export function isSupportedBackend(backend: any): boolean;
-export function providerVariantForBackend(backend: any): "codex-app-server" | "claude-agent-sdk" | "kimi-cli-wire" | "opencode-sdk";
-export function assertSupportedBackend(backend: any): "codex" | "claude" | "kimi" | "opencode";
-export function createLocalAiSession(backend: any, options?: {}): CodexAppServerSession | ClaudeAgentSdkSession | KimiCliSession | OpencodeSdkSession;
+export function normalizeBackend(backend: any, options?: {}): Promise<any>;
+export function isSupportedBackend(backend: any, options?: {}): Promise<boolean>;
+export function providerVariantForBackend(backend: any, options?: {}): Promise<any>;
+export function assertSupportedBackend(backend: any, options?: {}): Promise<any>;
+export function createLocalAiSession(backend: any, options?: {}): Promise<any>;
 export const DEFAULT_PROVIDER_VARIANT: "codex-app-server";
 export const CLAUDE_PROVIDER_VARIANT: "claude-agent-sdk";
 export const KIMI_PROVIDER_VARIANT: "kimi-cli-wire";

package/dist/session-factory.js

@@ -2,11 +2,12 @@ import { CodexAppServerSession } from "./providers/codex-app-server-session.js";
 import { ClaudeAgentSdkSession } from "./providers/claude-agent-sdk-session.js";
 import { KimiCliSession } from "./providers/kimi-cli-session.js";
 import { OpencodeSdkSession } from "./providers/opencode-sdk-session.js";
+import { getExternalProviderDescriptor, resolveExternalBackend, } from "./external-provider-registry.js";
 export const DEFAULT_PROVIDER_VARIANT = "codex-app-server";
 export const CLAUDE_PROVIDER_VARIANT = "claude-agent-sdk";
 export const KIMI_PROVIDER_VARIANT = "kimi-cli-wire";
 export const OPENCODE_PROVIDER_VARIANT = "opencode-sdk";
-export function normalizeBackend(backend) {
+function normalizeBuiltInBackendName(backend) {
     const normalized = String(backend || "").trim().toLowerCase();
     if (normalized === "code") {
         return "codex";
@@ -22,12 +23,23 @@ export function normalizeBackend(backend) {
     }
     return normalized;
 }
-export function isSupportedBackend(backend) {
-    const normalized = normalizeBackend(backend);
-    return normalized === "codex" || normalized === "claude" || normalized === "kimi" || normalized === "opencode";
+export async function normalizeBackend(backend, options = {}) {
+    const normalized = normalizeBuiltInBackendName(backend);
+    if (normalized === "codex" || normalized === "claude" || normalized === "kimi" || normalized === "opencode") {
+        return normalized;
+    }
+    return await resolveExternalBackend(normalized, options);
+}
+export async function isSupportedBackend(backend, options = {}) {
+    const normalized = await normalizeBackend(backend, options);
+    if (normalized === "codex" || normalized === "claude" || normalized === "kimi" || normalized === "opencode") {
+        return true;
+    }
+    const descriptor = await getExternalProviderDescriptor(normalized, options);
+    return Boolean(descriptor);
 }
-export function providerVariantForBackend(backend) {
-    const normalized = normalizeBackend(backend);
+export async function providerVariantForBackend(backend, options = {}) {
+    const normalized = await normalizeBackend(backend, options);
     if (normalized === "claude") {
         return CLAUDE_PROVIDER_VARIANT;
     }
@@ -37,17 +49,28 @@ export function providerVariantForBackend(backend) {
     if (normalized === "opencode") {
         return OPENCODE_PROVIDER_VARIANT;
     }
+    if (normalized === "codex") {
+        return DEFAULT_PROVIDER_VARIANT;
+    }
+    const descriptor = await getExternalProviderDescriptor(normalized, options);
+    if (descriptor?.variant) {
+        return descriptor.variant;
+    }
     return DEFAULT_PROVIDER_VARIANT;
 }
-export function assertSupportedBackend(backend) {
-    const normalized = normalizeBackend(backend);
+export async function assertSupportedBackend(backend, options = {}) {
+    const normalized = await normalizeBackend(backend, options);
     if (normalized === "codex" || normalized === "claude" || normalized === "kimi" || normalized === "opencode") {
         return normalized;
     }
-    throw new Error(`Unsupported AI SDK backend "${backend}". Only codex app-server, claude agent-sdk, kimi cli wire, and opencode sdk are supported.`);
+    const descriptor = await getExternalProviderDescriptor(normalized, options);
+    if (descriptor) {
+        return normalized;
+    }
+    throw new Error(`Unsupported AI SDK backend "${backend}". Built-in backends are codex app-server, claude agent-sdk, kimi cli wire, and opencode sdk. Set AISDK_PROVIDER_PATH to load external providers.`);
 }
-export function createLocalAiSession(backend, options = {}) {
-    const normalized = assertSupportedBackend(backend);
+export async function createLocalAiSession(backend, options = {}) {
+    const normalized = await assertSupportedBackend(backend, options);
     if (normalized === "claude") {
         return new ClaudeAgentSdkSession(normalized, options);
     }
@@ -57,7 +80,14 @@ export function createLocalAiSession(backend, options = {}) {
     if (normalized === "opencode") {
         return new OpencodeSdkSession(normalized, options);
     }
-    return new CodexAppServerSession(normalized, options);
+    if (normalized === "codex") {
+        return new CodexAppServerSession(normalized, options);
+    }
+    const descriptor = await getExternalProviderDescriptor(normalized, options);
+    if (!descriptor) {
+        throw new Error(`External AI SDK provider "${normalized}" is unavailable.`);
+    }
+    return await descriptor.createSession(normalized, options);
 }
 export { CodexAppServerSession };
 export { ClaudeAgentSdkSession };