openclaw-openagent 1.0.11 → 1.0.13

package/dist/src/plugin-ui/index.d.ts

@@ -10,4 +10,4 @@
  * 由 index.ts register() 调用。内部通过 Manifest Reconciler
  * 自动完成扩展点的 apply / revert / skip。
  */
-export declare function injectControlUiOverride(): Promise<void>;
+export declare function injectControlUiOverride(hostVersion?: string): Promise<void>;

package/dist/src/plugin-ui/index.js

@@ -11,6 +11,6 @@ import { loadUIExtensions } from './ui-extension-loader/index.js';
  * 由 index.ts register() 调用。内部通过 Manifest Reconciler
  * 自动完成扩展点的 apply / revert / skip。
  */
-export async function injectControlUiOverride() {
-    await loadUIExtensions();
+export async function injectControlUiOverride(hostVersion) {
+    await loadUIExtensions({ hostVersion });
 }

package/dist/src/plugin-ui/ui-extension-loader/index.d.ts

@@ -8,6 +8,7 @@
  *
  * 每次 Gateway 启动时调用 loadUIExtensions()。
  */
+import type { UIExtensionContext } from './types.js';
 /**
  * 加载全部 UI 扩展。
  *
@@ -18,7 +19,7 @@
  * 4. 共享文件扩展按组处理：任何一个变更 → 恢复 backup → 重新 apply 全组
  * 5. 写入新 manifest
  */
-export declare function loadUIExtensions(): Promise<void>;
+export declare function loadUIExtensions(context?: UIExtensionContext): Promise<void>;
 /**
  * 卸载全部 UI 扩展（插件卸载时调用）。
  *

package/dist/src/plugin-ui/ui-extension-loader/index.js

@@ -46,7 +46,7 @@ oldVersion // null = manifest 中不存在
  * 4. 共享文件扩展按组处理：任何一个变更 → 恢复 backup → 重新 apply 全组
  * 5. 写入新 manifest
  */
-export async function loadUIExtensions() {
+export async function loadUIExtensions(context = {}) {
     const controlUiDir = resolveControlUiDir();
     if (!controlUiDir) {
         logger.warn('[ui-ext] control-ui directory not found, skipping');
@@ -112,7 +112,7 @@ export async function loadUIExtensions() {
             safeRevert(ext, controlUiDir);
         }
         logger.debug(`[ui-ext] ${ext.id}: apply v${ext.version}`);
-        if (safeApply(ext, controlUiDir)) {
+        if (safeApply(ext, controlUiDir, context)) {
             newExtensions[ext.id] = { version: ext.version };
             applied++;
         }
@@ -171,7 +171,7 @@ export async function loadUIExtensions() {
         // 重新 apply 全组中所有应保留的扩展
         for (const ext of group) {
             logger.debug(`[ui-ext] ${ext.id}: apply v${ext.version} (group rebuild)`);
-            if (safeApply(ext, controlUiDir)) {
+            if (safeApply(ext, controlUiDir, context)) {
                 newExtensions[ext.id] = { version: ext.version };
                 applied++;
             }
@@ -212,9 +212,9 @@ export async function unloadUIExtensions() {
     logger.info('[ui-ext] All UI extensions unloaded');
 }
 // ── Helpers ──────────────────────────────────────────────────────────────
-function safeApply(ext, controlUiDir) {
+function safeApply(ext, controlUiDir, context) {
     try {
-        return ext.apply(controlUiDir);
+        return ext.apply(controlUiDir, context);
     }
     catch (err) {
         logger.error(`[ui-ext] Failed to apply '${ext.id}': ${err.message}`);

package/dist/src/plugin-ui/ui-extension-loader/registry-regex.js

@@ -16,9 +16,74 @@ import { makeMarker, hasMarker } from './types.js';
 const OVERRIDE_ASSET_URL = new URL('../assets/openagent-override.js', import.meta.url);
 const ICON_ASSET_URL = new URL('../assets/icon.png', import.meta.url);
 const BG_ASSET_URL = new URL('../assets/bg.png', import.meta.url);
-function getOverrideAssetHash() {
+const HOST_ADAPTER_URLS = {
+    'oc-2026-04': new URL('../adapters/oc-2026-04.js', import.meta.url),
+    'oc-2026-05': new URL('../adapters/oc-2026-05.js', import.meta.url),
+    'oc-2026-06': new URL('../adapters/oc-2026-06.js', import.meta.url),
+    'oc-unknown': new URL('../adapters/oc-unknown.js', import.meta.url),
+};
+const HOST_ADAPTER_START = '/*__OPENAGENT_HOST_ADAPTER_START__*/';
+const HOST_ADAPTER_END = '/*__OPENAGENT_HOST_ADAPTER_END__*/';
+const HOST_ADAPTER_BLOCK_RE = /\/\*__OPENAGENT_HOST_ADAPTER_START__\*\/[\s\S]*?\/\*__OPENAGENT_HOST_ADAPTER_END__\*\//;
+const BUILD_ID_TOKEN = "buildId: '__OPENAGENT_BUILD_ID__'";
+const BUILD_ID_ASSIGNMENT_RE = /buildId:\s*(?:"[^"]*"|'[^']*')/;
+function normalizeHostVersion(hostVersion) {
+    const value = String(hostVersion || '').trim();
+    if (!value || value === 'unknown')
+        return '';
+    const match = value.match(/20\d{2}\.\d{1,2}\.\d{1,2}(?:-[A-Za-z0-9._-]+)?/);
+    return match ? match[0] : '';
+}
+function resolveHostAdapterId(hostVersion) {
+    const version = normalizeHostVersion(hostVersion);
+    const parts = version.split('.');
+    const year = Number.parseInt(parts[0], 10);
+    const month = Number.parseInt(parts[1], 10);
+    if (year === 2026 && month === 4)
+        return 'oc-2026-04';
+    if (year === 2026 && month === 5)
+        return 'oc-2026-05';
+    if (year === 2026 && month === 6)
+        return 'oc-2026-06';
+    return 'oc-unknown';
+}
+function getHostAdapterBlock(hostVersion) {
+    let adapterId = resolveHostAdapterId(hostVersion);
+    let adapterUrl = HOST_ADAPTER_URLS[adapterId];
+    if (!adapterUrl || !existsSync(adapterUrl)) {
+        adapterId = 'oc-unknown';
+        adapterUrl = HOST_ADAPTER_URLS[adapterId];
+    }
+    const adapterSource = readFileSync(adapterUrl, 'utf-8').trimEnd();
+    return [
+        HOST_ADAPTER_START,
+        `// HOST ADAPTER: ${adapterId}`,
+        adapterSource,
+        HOST_ADAPTER_END,
+    ].join('\n');
+}
+function injectHostAdapter(source, hostVersion) {
+    const block = getHostAdapterBlock(hostVersion);
+    return HOST_ADAPTER_BLOCK_RE.test(source)
+        ? source.replace(HOST_ADAPTER_BLOCK_RE, block)
+        : source;
+}
+function injectBuildId(source) {
+    const normalized = source.replace(BUILD_ID_ASSIGNMENT_RE, BUILD_ID_TOKEN);
+    const buildId = createHash('sha256').update(normalized).digest('hex').slice(0, 12);
+    return normalized.replace(BUILD_ID_TOKEN, `buildId: ${JSON.stringify(buildId)}`);
+}
+function getOverrideAssetContent(context) {
+    let source = readFileSync(OVERRIDE_ASSET_URL, 'utf-8');
+    const hostVersion = normalizeHostVersion(context?.hostVersion);
+    if (hostVersion) {
+        source = source.replace("hostVersion: '__OPENCLAW_HOST_VERSION__'", `hostVersion: ${JSON.stringify(hostVersion)}`);
+    }
+    return injectBuildId(injectHostAdapter(source, hostVersion));
+}
+function getOverrideAssetHash(context) {
     return createHash('sha256')
-        .update(readFileSync(OVERRIDE_ASSET_URL))
+        .update(getOverrideAssetContent(context))
         .digest('hex')
         .slice(0, 12);
 }
@@ -99,21 +164,21 @@ const overrideScript = {
     id: 'override-script',
     version: 1,
     alwaysApply: true,
-    apply(controlUiDir) {
+    apply(controlUiDir, context) {
         if (!existsSync(OVERRIDE_ASSET_URL)) {
             logger.warn('[ui-ext:regex] override-script: asset missing');
             return false;
         }
         const dest = join(controlUiDir, 'openagent-override.js');
+        const srcContent = getOverrideAssetContent(context);
         if (existsSync(dest)) {
-            const srcContent = readFileSync(OVERRIDE_ASSET_URL, 'utf-8');
             const destContent = readFileSync(dest, 'utf-8');
             if (srcContent === destContent) {
                 logger.debug('[ui-ext:regex] override-script: content unchanged, skip');
                 return true;
             }
         }
-        copyFileSync(OVERRIDE_ASSET_URL, dest);
+        writeFileSync(dest, srcContent, 'utf-8');
         logger.info('[ui-ext:regex] override-script: deployed openagent-override.js');
         // Deploy icon.png alongside
         if (existsSync(ICON_ASSET_URL)) {
@@ -167,7 +232,7 @@ const htmlScriptTag = {
     id: 'html-script-tag',
     version: 5,
     alwaysApply: true,
-    apply(controlUiDir) {
+    apply(controlUiDir, context) {
         const indexPath = join(controlUiDir, 'index.html');
         if (!existsSync(indexPath)) {
             logger.warn('[ui-ext:regex] html-script-tag: index.html not found');
@@ -176,8 +241,10 @@ const htmlScriptTag = {
         let html = readFileSync(indexPath, 'utf-8');
         const htmlMarker = `<!--openagent:${this.id}-->`;
         const markerPattern = /(?:\/\*openagent:html-script-tag\*\/|<!--openagent:html-script-tag-->)/;
-        const overrideHash = getOverrideAssetHash();
-        const scriptTag = `${htmlMarker}<script src="./openagent-override.js?v=${overrideHash}"></script>`;
+        const overrideHash = getOverrideAssetHash(context);
+        const hostVersion = normalizeHostVersion(context?.hostVersion);
+        const hostVersionAttr = hostVersion ? ` data-openagent-host-version="${hostVersion}"` : '';
+        const scriptTag = `${htmlMarker}<script src="./openagent-override.js?v=${overrideHash}"${hostVersionAttr}></script>`;
         const markedScriptPattern = /(?:\/\*openagent:html-script-tag\*\/|<!--openagent:html-script-tag-->)<script[^>]*openagent-override[^>]*><\/script>\n?\s*/g;
         const oldScriptPattern = /<script[^>]*openagent-override[^>]*><\/script>\n?\s*/g;
         if (markerPattern.test(html)) {

package/dist/src/plugin-ui/ui-extension-loader/types.d.ts

@@ -32,7 +32,7 @@ export interface UIExtension {
      * 接收 control-ui 目录路径，内部自行决定改什么文件、怎么改。
      * 返回 true 表示成功，false 表示失败（不写入 manifest，下次重试）。
      */
-    apply: (controlUiDir: string) => boolean;
+    apply: (controlUiDir: string, context?: UIExtensionContext) => boolean;
     /**
      * 卸载扩展。
      * 还原 apply 所做的全部修改。
@@ -40,6 +40,9 @@ export interface UIExtension {
      */
     revert: (controlUiDir: string) => void;
 }
+export interface UIExtensionContext {
+    hostVersion?: string;
+}
 /**
  * OpenAgent 标记前缀，注入的代码旁加此注释以标识修改来源。
  * 格式：/*openagent:<extension-id>* /

package/dist/src/proxy/auth-proxy.js

@@ -17,6 +17,7 @@ import fs from 'node:fs';
 import nodePath from 'node:path';
 import { logger } from '../util/logger.js';
 import { registry } from '../runtime/registry.js';
+import { getOpenagentUpdateStatus } from '../runtime/update-checker.js';
 import { isUnconfiguredOasnApiBase } from '../auth/config.js';
 import { resolveOasnRelativeUrl } from '../util/url-resolver.js';
 /** TIM 路径默认上游（兼容旧版） */
@@ -90,6 +91,10 @@ export function createAuthProxyHandler() {
         if (targetPath.startsWith('/media/')) {
             return serveLocalMedia(targetPath, res);
         }
+        if (targetPath === '/update-status') {
+            writeJson(res, 200, getOpenagentUpdateStatus());
+            return true;
+        }
         // v3.9+ 双轨抽象：上游按当前 transport 切换（OASN → api.oasn.ai；TIM → auth.ai-talk.live）
         const method = req.method ?? 'GET';
         const rt = registry.getDefault();

package/dist/src/runtime/update-checker.d.ts

@@ -0,0 +1,18 @@
+export type OpenagentUpdatePolicy = 'notify' | 'auto' | 'off';
+export type OpenagentUpdateStatus = {
+    checked: boolean;
+    checking: boolean;
+    currentVersion: string;
+    latestVersion: string;
+    distTag: string;
+    updateAvailable: boolean;
+    policy: OpenagentUpdatePolicy;
+    installCommand: string;
+    autoUpdateStarted: boolean;
+    lastCheckedAt?: string;
+    error?: string;
+};
+export declare function getOpenagentUpdateStatus(): OpenagentUpdateStatus;
+export declare function startOpenagentUpdateChecker(): void;
+export declare function runOpenagentUpdateCheck(): Promise<OpenagentUpdateStatus>;
+export declare function compareVersions(a: string, b: string): number;

package/dist/src/runtime/update-checker.js

@@ -0,0 +1,253 @@
+import { spawn } from 'node:child_process';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { logger } from '../util/logger.js';
+const PLUGIN_PACKAGE = 'openclaw-openagent';
+const CLI_PACKAGE = 'openclaw-openagent-cli';
+const DEFAULT_DIST_TAG = 'latest';
+const DEFAULT_REGISTRY = 'https://registry.npmjs.org';
+const CHECK_DELAY_MS = 3_000;
+let checkerStarted = false;
+const updateStatus = {
+    checked: false,
+    checking: false,
+    currentVersion: '',
+    latestVersion: '',
+    distTag: DEFAULT_DIST_TAG,
+    updateAvailable: false,
+    policy: 'notify',
+    installCommand: `npx -y ${CLI_PACKAGE}`,
+    autoUpdateStarted: false,
+};
+export function getOpenagentUpdateStatus() {
+    return { ...updateStatus };
+}
+export function startOpenagentUpdateChecker() {
+    if (checkerStarted)
+        return;
+    checkerStarted = true;
+    setTimeout(() => {
+        void runOpenagentUpdateCheck().catch((err) => {
+            updateStatus.checked = true;
+            updateStatus.checking = false;
+            updateStatus.error = err.message;
+            updateStatus.lastCheckedAt = new Date().toISOString();
+            logger.warn(`[update-check] failed: ${err.message}`);
+        });
+    }, CHECK_DELAY_MS).unref?.();
+}
+export async function runOpenagentUpdateCheck() {
+    const config = resolveUpdateConfig();
+    updateStatus.policy = config.policy;
+    updateStatus.distTag = config.distTag;
+    updateStatus.installCommand = buildInstallCommand(config);
+    updateStatus.currentVersion = resolveCurrentVersion();
+    if (config.policy === 'off') {
+        updateStatus.checked = true;
+        updateStatus.checking = false;
+        updateStatus.updateAvailable = false;
+        updateStatus.lastCheckedAt = new Date().toISOString();
+        logger.info('[update-check] disabled by policy');
+        return getOpenagentUpdateStatus();
+    }
+    updateStatus.checking = true;
+    updateStatus.error = undefined;
+    try {
+        const latestVersion = await fetchDistTagVersion(config.distTag);
+        updateStatus.latestVersion = latestVersion;
+        updateStatus.updateAvailable = compareVersions(latestVersion, updateStatus.currentVersion) > 0;
+        updateStatus.checked = true;
+        updateStatus.checking = false;
+        updateStatus.lastCheckedAt = new Date().toISOString();
+        if (!updateStatus.updateAvailable) {
+            logger.info(`[update-check] up to date: ${PLUGIN_PACKAGE}@${updateStatus.currentVersion}`);
+            return getOpenagentUpdateStatus();
+        }
+        logger.warn(`[update-check] new ${PLUGIN_PACKAGE} version available: `
+            + `${updateStatus.currentVersion} -> ${latestVersion}. Run: ${updateStatus.installCommand}`);
+        if (config.policy === 'auto') {
+            startAutoUpdate(config);
+        }
+        return getOpenagentUpdateStatus();
+    }
+    catch (err) {
+        updateStatus.checked = true;
+        updateStatus.checking = false;
+        updateStatus.error = err.message;
+        updateStatus.lastCheckedAt = new Date().toISOString();
+        throw err;
+    }
+}
+function resolveUpdateConfig() {
+    const fileConfig = readOpenagentConfig();
+    const envPolicy = normalizePolicy(process.env.OPENAGENT_UPDATE_POLICY);
+    const autoUpdateEnv = readBool(process.env.OPENAGENT_AUTO_UPDATE ?? process.env.OPENAGENT_PLUGIN_AUTO_UPDATE);
+    const checkEnabledEnv = readBool(process.env.OPENAGENT_UPDATE_CHECK);
+    const configPolicy = normalizePolicy(readString(fileConfig, 'update_policy', 'updatePolicy'));
+    const configAutoUpdate = readBool(readString(fileConfig, 'auto_update', 'autoUpdate'));
+    const configUpdateCheck = readBool(readString(fileConfig, 'update_check', 'updateCheck'));
+    let policy = configPolicy || 'notify';
+    if (configAutoUpdate === true)
+        policy = 'auto';
+    if (configUpdateCheck === false)
+        policy = 'off';
+    if (envPolicy)
+        policy = envPolicy;
+    if (autoUpdateEnv === true)
+        policy = 'auto';
+    if (checkEnabledEnv === false)
+        policy = 'off';
+    const distTag = normalizeDistTag(process.env.OPENAGENT_UPDATE_DIST_TAG
+        || readString(fileConfig, 'update_dist_tag', 'updateDistTag')
+        || process.env.OPENAGENT_PLUGIN_DIST_TAG
+        || DEFAULT_DIST_TAG);
+    const channel = normalizeDistTag(process.env.OPENAGENT_UPDATE_CHANNEL
+        || readString(fileConfig, 'update_channel', 'updateChannel')
+        || process.env.OPENAGENT_PLUGIN_CHANNEL
+        || '');
+    return {
+        policy,
+        distTag: channel || distTag,
+        channel,
+    };
+}
+function startAutoUpdate(config) {
+    if (updateStatus.autoUpdateStarted)
+        return;
+    updateStatus.autoUpdateStarted = true;
+    const npxBin = process.platform === 'win32' ? 'npx.cmd' : 'npx';
+    const args = ['-y', CLI_PACKAGE, 'update'];
+    if (config.channel) {
+        args.push('--channel', config.channel);
+    }
+    else if (config.distTag && config.distTag !== DEFAULT_DIST_TAG) {
+        args.push('--dist-tag', config.distTag);
+    }
+    logger.warn(`[update-check] auto update started: ${npxBin} ${args.join(' ')}`);
+    const child = spawn(npxBin, args, {
+        detached: true,
+        stdio: 'ignore',
+        env: process.env,
+    });
+    child.unref();
+}
+function buildInstallCommand(config) {
+    const parts = ['npx', '-y', CLI_PACKAGE, 'update'];
+    if (config.channel) {
+        parts.push('--channel', config.channel);
+    }
+    else if (config.distTag && config.distTag !== DEFAULT_DIST_TAG) {
+        parts.push('--dist-tag', config.distTag);
+    }
+    return parts.join(' ');
+}
+async function fetchDistTagVersion(distTag) {
+    if (process.env.OPENAGENT_UPDATE_TEST_VERSION) {
+        return process.env.OPENAGENT_UPDATE_TEST_VERSION;
+    }
+    const registry = (process.env.OPENAGENT_UPDATE_REGISTRY || DEFAULT_REGISTRY).replace(/\/+$/, '');
+    const url = `${registry}/${encodeURIComponent(PLUGIN_PACKAGE)}/${encodeURIComponent(distTag)}`;
+    const res = await fetch(url, {
+        headers: { Accept: 'application/json' },
+        signal: AbortSignal.timeout(5_000),
+    });
+    if (!res.ok) {
+        throw new Error(`npm registry ${res.status} for ${PLUGIN_PACKAGE}@${distTag}`);
+    }
+    const data = await res.json();
+    const version = typeof data.version === 'string' ? data.version : '';
+    if (!version)
+        throw new Error(`npm registry response missing version for ${PLUGIN_PACKAGE}@${distTag}`);
+    return version;
+}
+function resolveCurrentVersion() {
+    const packageJson = findPackageJson();
+    if (!packageJson)
+        return '0.0.0';
+    try {
+        const data = JSON.parse(fs.readFileSync(packageJson, 'utf8'));
+        return typeof data.version === 'string' ? data.version : '0.0.0';
+    }
+    catch {
+        return '0.0.0';
+    }
+}
+function findPackageJson() {
+    let dir = path.dirname(fileURLToPath(import.meta.url));
+    for (let i = 0; i < 8; i += 1) {
+        const candidate = path.join(dir, 'package.json');
+        try {
+            const data = JSON.parse(fs.readFileSync(candidate, 'utf8'));
+            if (data.name === PLUGIN_PACKAGE)
+                return candidate;
+        }
+        catch { }
+        const parent = path.dirname(dir);
+        if (parent === dir)
+            break;
+        dir = parent;
+    }
+    return null;
+}
+function readOpenagentConfig() {
+    const stateDir = process.env.OPENCLAW_STATE_DIR || path.join(os.homedir(), '.openclaw');
+    const configPath = path.join(stateDir, 'openclaw.json');
+    try {
+        const root = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+        return root.channels?.openagent || {};
+    }
+    catch {
+        return {};
+    }
+}
+function readString(obj, ...keys) {
+    for (const key of keys) {
+        const value = obj[key];
+        if (typeof value === 'string' && value.trim())
+            return value.trim();
+        if (typeof value === 'boolean')
+            return value ? 'true' : 'false';
+    }
+    return '';
+}
+function readBool(value) {
+    if (typeof value === 'boolean')
+        return value;
+    const text = typeof value === 'string' ? value.trim().toLowerCase() : '';
+    if (!text)
+        return null;
+    if (['1', 'true', 'yes', 'on', 'auto'].includes(text))
+        return true;
+    if (['0', 'false', 'no', 'off', 'notify'].includes(text))
+        return false;
+    return null;
+}
+function normalizePolicy(value) {
+    const text = typeof value === 'string' ? value.trim().toLowerCase() : '';
+    if (text === 'auto' || text === 'notify' || text === 'off')
+        return text;
+    return '';
+}
+function normalizeDistTag(value) {
+    const text = typeof value === 'string' ? value.trim() : '';
+    if (!text)
+        return '';
+    return /^[A-Za-z0-9._-]+$/.test(text) ? text : '';
+}
+export function compareVersions(a, b) {
+    const pa = parseVersion(a);
+    const pb = parseVersion(b);
+    for (let i = 0; i < 3; i += 1) {
+        if (pa[i] !== pb[i])
+            return pa[i] - pb[i];
+    }
+    return 0;
+}
+function parseVersion(version) {
+    const match = String(version || '').match(/(\d+)\.(\d+)\.(\d+)/);
+    if (!match)
+        return [0, 0, 0];
+    return [Number(match[1]), Number(match[2]), Number(match[3])];
+}

package/dist/src/state/store.d.ts

@@ -53,6 +53,21 @@ export interface PendingInvocationRecord {
     created_at: number;
     updated_at: number;
 }
+/**
+ * 远程 ServiceAgent 会话续传记录。
+ *
+ * 一个 OpenClaw 本地会话里，同一个远程 Agent 的第一次 invocation 会返回
+ * session_id；后续 mode='session' 的调用应带回这个 session_id，才能保留
+ * 远端上下文。account_id + openclaw_session_key + target_agent_id 共同隔离，
+ * 避免不同账号、不同本地聊天、不同远程 Agent 之间串 session。
+ */
+export interface RemoteAgentSessionRecord {
+    openclaw_session_key: string;
+    target_agent_id: string;
+    session_id: string;
+    created_at: number;
+    updated_at: number;
+}
 export declare class StateStore {
     private db;
     private accountId;
@@ -121,6 +136,12 @@ export declare class StateStore {
      * Close the database connection
      */
     close(): void;
+    getRemoteAgentSession(openclawSessionKey: string, targetAgentId: string): string | null;
+    upsertRemoteAgentSession(record: {
+        openclaw_session_key: string;
+        target_agent_id: string;
+        session_id: string;
+    }): void;
     /**
      * 查 tool_call_id 是否有未完成记录。命中 → 复用其 idempotency_key 防止重复创建 Invocation。
      *

package/dist/src/state/store.js

@@ -211,6 +211,21 @@ export class StateStore {
         this.db.run(`
       CREATE INDEX IF NOT EXISTS idx_pending_invocations_invocation
       ON pending_invocations (account_id, invocation_id)
+    `);
+        this.db.run(`
+      CREATE TABLE IF NOT EXISTS remote_agent_sessions (
+        account_id             TEXT NOT NULL,
+        openclaw_session_key   TEXT NOT NULL,
+        target_agent_id        TEXT NOT NULL,
+        session_id             TEXT NOT NULL,
+        created_at             INTEGER NOT NULL DEFAULT 0,
+        updated_at             INTEGER NOT NULL DEFAULT 0,
+        PRIMARY KEY (account_id, openclaw_session_key, target_agent_id)
+      )
+    `);
+        this.db.run(`
+      CREATE INDEX IF NOT EXISTS idx_remote_agent_sessions_updated
+      ON remote_agent_sessions (account_id, updated_at)
     `);
     }
     // ── Write to disk ──
@@ -408,6 +423,45 @@ export class StateStore {
         }
     }
     // ═════════════════════════════════════════════════════════════════
+    // OASN remote_agent_sessions CRUD
+    //
+    // 保存远端 ServiceAgent 返回的 session_id，用于同一 OpenClaw 会话内后续
+    // mode='session' 调用续传。run 模式不读写这张表。
+    // ═════════════════════════════════════════════════════════════════
+    getRemoteAgentSession(openclawSessionKey, targetAgentId) {
+        if (!this.db)
+            return null;
+        const scopeKey = openclawSessionKey.trim();
+        const agentId = targetAgentId.trim();
+        if (!scopeKey || !agentId)
+            return null;
+        const stmt = this.db.prepare(`SELECT session_id
+       FROM remote_agent_sessions
+       WHERE account_id = ? AND openclaw_session_key = ? AND target_agent_id = ?`);
+        stmt.bind([this.accountId, scopeKey, agentId]);
+        const row = stmt.step() ? stmt.getAsObject() : null;
+        stmt.free();
+        const sessionId = row?.['session_id'];
+        return typeof sessionId === 'string' && sessionId.trim() ? sessionId : null;
+    }
+    upsertRemoteAgentSession(record) {
+        if (!this.db)
+            return;
+        const scopeKey = record.openclaw_session_key.trim();
+        const agentId = record.target_agent_id.trim();
+        const sessionId = record.session_id.trim();
+        if (!scopeKey || !agentId || !sessionId)
+            return;
+        const now = Date.now();
+        this.db.run(`INSERT INTO remote_agent_sessions
+         (account_id, openclaw_session_key, target_agent_id, session_id, created_at, updated_at)
+       VALUES (?, ?, ?, ?, ?, ?)
+       ON CONFLICT(account_id, openclaw_session_key, target_agent_id) DO UPDATE SET
+         session_id = excluded.session_id,
+         updated_at = excluded.updated_at`, [this.accountId, scopeKey, agentId, sessionId, now, now]);
+        this.persist();
+    }
+    // ═════════════════════════════════════════════════════════════════
     // §11.1 OASN pending_invocations CRUD（OasnInvocation.PendingInvocationStore 适配）
     //
     // 设计依据：docs/specs/2026-06-16-oasn-transport-abstraction-design.md §11.1

package/dist/src/transport/oasn/oasn-invocation.d.ts

@@ -139,6 +139,9 @@ export declare class OasnInvocation {
     private _toWebuiContinuation;
     /** 终态错误专用 TransportError，便于上层 catch */
     private _terminalError;
+    private _invocationFailureCode;
+    private _invocationFailureMessage;
+    private _firstText;
     private _toArtifactRef;
     private _normalizeCreateInvocation;
     /** clamp 轮询间隔到合理范围 */