@jingyi0605/codingns4dsh 0.1.7-rc.3 → 0.2.0-beta.1

package/data/build/dist/host/cli-adapters/provider-subscription.js

@@ -15,14 +15,20 @@ export class ProviderSubscriptionService {
     sub2api;
     deepseek;
     official;
+    kimi;
+    grok;
     constructor(options = {}) {
+        // 全局超时只作为缺省值；单项服务显式给出的 timeoutMs 优先。
+        const shared = options.timeoutMs === undefined ? {} : { timeoutMs: options.timeoutMs };
         this.commandCode = options.commandCode;
-        this.codex = new CodexSubscriptionService(options.codex);
-        this.claudeCode = new ClaudeCodeSubscriptionService(options.claudeCode);
+        this.codex = new CodexSubscriptionService({ ...shared, ...options.codex });
+        this.claudeCode = new ClaudeCodeSubscriptionService({ ...shared, ...options.claudeCode });
         this.opencode = new OpenCodeSubscriptionService(options.opencode);
-        this.sub2api = new Sub2ApiUsageService(options.sub2api);
-        this.deepseek = new DeepseekSubscriptionService(options.deepseek);
-        this.official = new OfficialProviderSubscriptionService(options.official);
+        this.sub2api = new Sub2ApiUsageService({ ...shared, ...options.sub2api });
+        this.deepseek = new DeepseekSubscriptionService({ ...shared, ...options.deepseek });
+        this.official = new OfficialProviderSubscriptionService({ ...shared, ...options.official });
+        this.kimi = new KimiSubscriptionService({ ...shared, ...options.kimi });
+        this.grok = new GrokSubscriptionService({ ...shared, ...options.grok });
     }
     read(adapterId, providerId) {
         if (adapterId === 'dsh')
@@ -35,6 +41,7 @@ export class ProviderSubscriptionService {
             case 'codex': return this.codex.read();
             case 'claude-code': return this.claudeCode.read();
             case 'opencode': return this.opencode.read();
+            case 'kimi': return this.kimi.read().then((usage) => usage === null ? null : withProvider(usage, identifyModelProvider({ name: 'kimi-coding' }), ''));
             default: return Promise.resolve(null);
         }
     }
@@ -71,6 +78,8 @@ export class ProviderSubscriptionService {
             return this.codex.read().then((usage) => usage === null ? null : withProvider(usage, identifyModelProvider({ name: 'openai-codex' }), ''));
         if (adapterId === 'claude-code')
             return this.claudeCode.read().then((usage) => usage === null ? null : withProvider(usage, identifyModelProvider({ name: 'anthropic' }), ''));
+        if (adapterId === 'grok')
+            return this.grok.read().then((usage) => usage === null ? null : withProvider(usage, identifyModelProvider({ name: 'xai' }), ''));
         return null;
     }
 }
@@ -304,6 +313,338 @@ export class OpenCodeSubscriptionService {
         return null;
     }
 }
+/** 读取 Kimi Code 官方套餐额度；本地 OAuth 凭据只在 Host 内使用，不做刷新只读访问令牌。 */
+export class KimiSubscriptionService {
+    request;
+    timeoutMs;
+    credentialPaths;
+    constructor(options = {}) {
+        this.request = options.fetch ?? fetch;
+        this.timeoutMs = options.timeoutMs ?? 8_000;
+        this.credentialPaths = options.credentials ?? defaultKimiCredentialPaths();
+    }
+    async read() {
+        const token = this.readAccessToken();
+        if (token === null)
+            return null;
+        for (const baseUrl of kimiCodeBaseUrls(token.region)) {
+            const usage = await this.readUsage(baseUrl, token.value);
+            if (usage !== null)
+                return usage;
+        }
+        return null;
+    }
+    readAccessToken() {
+        for (const path of this.credentialPaths) {
+            const credentials = readJson(path);
+            const token = textValue(credentials?.access_token);
+            if (token === null)
+                continue;
+            const expiresAt = numberValue(credentials?.expires_at);
+            // 访问令牌有效期很短；已过期或临期的令牌直接跳过，由 CLI 自己负责刷新。
+            if (expiresAt !== null && expiresAt * 1000 <= Date.now() + 30_000)
+                continue;
+            return { value: token, region: kimiTokenRegion(token) };
+        }
+        return null;
+    }
+    async readUsage(baseUrl, token) {
+        const controller = new AbortController();
+        const timer = setTimeout(() => controller.abort(), this.timeoutMs);
+        try {
+            const response = await this.request(`${baseUrl}/usages`, {
+                headers: { Authorization: `Bearer ${token}`, Accept: 'application/json' },
+                signal: controller.signal,
+            });
+            if (!response.ok)
+                return null;
+            return normalizeKimiUsage(await response.json());
+        }
+        catch {
+            return null;
+        }
+        finally {
+            clearTimeout(timer);
+        }
+    }
+}
+const GROK_BILLING_ENDPOINT = 'https://grok.com/grok_api_v2.GrokBuildBilling/GetGrokCreditsConfig';
+const GROK_OIDC_SCOPE_PREFIX = 'https://auth.x.ai::';
+const GROK_LEGACY_SESSION_SCOPE = 'https://accounts.x.ai/sign-in';
+/** 读取 Grok（xAI）官方 SuperGrok 订阅额度；只读 Grok CLI 的 OAuth 凭据（~/.grok/auth.json），不做刷新，过期令牌也照常尝试以容忍时钟偏差。 */
+export class GrokSubscriptionService {
+    request;
+    timeoutMs;
+    credentialPaths;
+    constructor(options = {}) {
+        this.request = options.fetch ?? fetch;
+        this.timeoutMs = options.timeoutMs ?? 15_000;
+        this.credentialPaths = options.credentials ?? defaultGrokCredentialPaths();
+    }
+    async read() {
+        const token = this.readAccessToken();
+        if (token === null)
+            return null;
+        const controller = new AbortController();
+        const timer = setTimeout(() => controller.abort(), this.timeoutMs);
+        try {
+            // 空 gRPC-web 帧（1 字节 flags + 4 字节大端长度 0）即可取回账单快照。
+            const response = await this.request(GROK_BILLING_ENDPOINT, {
+                method: 'POST',
+                headers: {
+                    Authorization: `Bearer ${token}`,
+                    Origin: 'https://grok.com',
+                    Referer: 'https://grok.com/?_s=usage',
+                    Accept: '*/*',
+                    'Content-Type': 'application/grpc-web+proto',
+                    'x-grpc-web': '1',
+                    'x-user-agent': 'connect-es/2.1.1',
+                },
+                body: new Uint8Array(5),
+                signal: controller.signal,
+            });
+            // 鉴权失败与其他 HTTP 错误都不展示陈旧数据；令牌过期时由 Grok CLI 重新登录后恢复。
+            if (!response.ok)
+                return null;
+            const headerStatus = numberValue(response.headers.get('grpc-status') ?? undefined);
+            if (headerStatus !== null && headerStatus !== 0)
+                return null;
+            const raw = new Uint8Array(await response.arrayBuffer());
+            const trailerStatus = numberValue(grpcWebTrailerFields(raw)['grpc-status']);
+            if (trailerStatus !== null && trailerStatus !== 0)
+                return null;
+            const nowSecs = Math.floor(Date.now() / 1000);
+            const snapshot = parseGrokBillingPayload(raw, nowSecs);
+            if (snapshot === null)
+                return null;
+            const usedPercent = clamp(snapshot.usedPercent);
+            return {
+                authenticated: true,
+                planType: null,
+                primary: { usedPercent, remainingPercent: 100 - usedPercent, windowDurationMins: grokWindowDurationMins(snapshot.resetsAt, nowSecs), resetsAt: snapshot.resetsAt },
+                secondary: null,
+                monthly: null,
+                rateLimitReachedType: null,
+                resetCredits: null,
+                capturedAt: new Date().toISOString(),
+            };
+        }
+        catch {
+            return null;
+        }
+        finally {
+            clearTimeout(timer);
+        }
+    }
+    readAccessToken() {
+        for (const path of this.credentialPaths) {
+            const auth = readJson(path);
+            if (auth === null)
+                continue;
+            const token = selectGrokAuthToken(auth);
+            if (token !== null)
+                return token;
+        }
+        return null;
+    }
+}
+function defaultGrokCredentialPaths() {
+    return [join(process.env.GROK_HOME ?? join(homedir(), '.grok'), 'auth.json')];
+}
+/** auth.json 以 OIDC scope URL 为键；优先 SuperGrok 的 auth.x.ai 条目，回退 legacy 登录条目，残缺条目不遮蔽健康条目。 */
+function selectGrokAuthToken(auth) {
+    let oidc = null;
+    let legacy = null;
+    for (const [scope, value] of Object.entries(auth)) {
+        const key = textValue(recordValue(value)?.key);
+        if (key === null)
+            continue;
+        if (scope.startsWith(GROK_OIDC_SCOPE_PREFIX))
+            oidc = key;
+        else if (scope === GROK_LEGACY_SESSION_SCOPE || scope.includes('/sign-in'))
+            legacy = key;
+    }
+    return oidc ?? legacy;
+}
+/** 按重置时间距今的天数推断窗口长度（4–12 天按周窗口、20–45 天按月窗口），无法推断时留空由客户端使用兜底标签。 */
+function grokWindowDurationMins(resetsAt, nowSecs) {
+    if (resetsAt === null)
+        return null;
+    const days = Math.round((resetsAt - nowSecs) / 86_400);
+    if (days >= 4 && days <= 12)
+        return 7 * 24 * 60;
+    if (days >= 20 && days <= 45)
+        return 30 * 24 * 60;
+    return null;
+}
+/**
+ * 账单端点没有公开 .proto，按字段路径启发式提取（移植自 cc-switch / CodexBar）：
+ * 百分比取路径末段为 1、值域 [0,100] 的最浅 fixed32 字段；重置时间取落在合理 Unix 秒区间且
+ * 晚于当前时刻的 varint（优先路径 [1,5,1]）；proto3 会省略 0 值字段，存在重置时间与周期标记时按 0% 处理。
+ */
+function parseGrokBillingPayload(data, nowSecs) {
+    let payloads = grpcWebDataFrames(data);
+    if (payloads.length === 0 && looksLikeProtobufPayload(data))
+        payloads = [data];
+    if (payloads.length === 0)
+        return null;
+    const scan = { fixed32: [], varint: [] };
+    for (const payload of payloads)
+        scanGrokProtobuf(payload, 0, [], 0, scan);
+    const percent = scan.fixed32
+        .filter((field) => field.path.at(-1) === 1 && Number.isFinite(field.value) && field.value >= 0 && field.value <= 100)
+        .sort((left, right) => (left.path.length - right.path.length) || (left.order - right.order))[0]?.value;
+    const resetCandidates = scan.varint.filter((field) => field.value >= 1_700_000_000 && field.value <= 2_100_000_000 && field.value > nowSecs);
+    const preferred = resetCandidates.filter((field) => field.path.length === 3 && field.path[0] === 1 && field.path[1] === 5 && field.path[2] === 1);
+    const resetPool = preferred.length > 0 ? preferred : resetCandidates;
+    const reset = resetPool.length > 0 ? Math.min(...resetPool.map((field) => field.value)) : null;
+    const hasUsagePeriod = scan.varint.some((field) => (field.path.length >= 2 && field.path[0] === 1 && field.path[1] === 6)
+        || (field.path.length === 3 && field.path[0] === 1 && field.path[1] === 8 && field.path[2] === 1 && (field.value === 1 || field.value === 2)));
+    const usedPercent = percent ?? (scan.fixed32.length === 0 && reset !== null && hasUsagePeriod ? 0 : undefined);
+    if (usedPercent === undefined)
+        return null;
+    return { usedPercent, resetsAt: reset };
+}
+/** 拆出 gRPC-web data 帧（flags 高位 0x80 的 trailer 帧跳过）；任一帧长度非法时返回空，调用方再按裸 protobuf 兜底。 */
+function grpcWebDataFrames(data) {
+    const frames = [];
+    let index = 0;
+    while (index < data.length) {
+        if (index + 5 > data.length)
+            return [];
+        const flags = data[index];
+        const length = data[index + 1] * 16_777_216 + data[index + 2] * 65_536 + data[index + 3] * 256 + data[index + 4];
+        const start = index + 5;
+        const end = start + length;
+        if (end > data.length)
+            return [];
+        if ((flags & 0x80) === 0)
+            frames.push(data.subarray(start, end));
+        index = end;
+    }
+    return frames;
+}
+/** 响应体没有帧头时，看首字节是否像合法 protobuf tag（某些成功请求直接返回裸 protobuf）。 */
+function looksLikeProtobufPayload(data) {
+    const first = data[0];
+    if (first === undefined)
+        return false;
+    const wireType = first & 0x07;
+    return first >> 3 > 0 && (wireType === 0 || wireType === 1 || wireType === 2 || wireType === 5);
+}
+/** 从 trailer 帧（flags & 0x80）解析 grpc-status / grpc-message 等字段。 */
+function grpcWebTrailerFields(data) {
+    const fields = {};
+    let index = 0;
+    while (index + 5 <= data.length) {
+        const flags = data[index];
+        const length = data[index + 1] * 16_777_216 + data[index + 2] * 65_536 + data[index + 3] * 256 + data[index + 4];
+        const start = index + 5;
+        const end = start + length;
+        if (end > data.length)
+            break;
+        if ((flags & 0x80) !== 0) {
+            for (const line of new TextDecoder().decode(data.subarray(start, end)).split(/\r?\n/u)) {
+                const separator = line.indexOf(':');
+                if (separator <= 0)
+                    continue;
+                fields[line.slice(0, separator).trim().toLowerCase()] = grokPercentDecode(line.slice(separator + 1).trim());
+            }
+        }
+        index = end;
+    }
+    return fields;
+}
+/** gRPC message 使用 percent-encoding；解码失败的序列原样保留。 */
+function grokPercentDecode(input) {
+    const bytes = new TextEncoder().encode(input);
+    const out = [];
+    let index = 0;
+    while (index < bytes.length) {
+        if (bytes[index] === 0x25 && index + 2 < bytes.length) {
+            const hex = String.fromCharCode(bytes[index + 1], bytes[index + 2]);
+            if (/^[0-9a-fA-F]{2}$/u.test(hex)) {
+                out.push(parseInt(hex, 16));
+                index += 3;
+                continue;
+            }
+        }
+        out.push(bytes[index]);
+        index += 1;
+    }
+    return new TextDecoder().decode(new Uint8Array(out));
+}
+function readGrokVarint(bytes, state) {
+    let value = 0;
+    let shift = 0;
+    while (state.index < bytes.length && shift < 64) {
+        const byte = bytes[state.index];
+        state.index += 1;
+        value += (byte & 0x7f) * 2 ** shift;
+        if ((byte & 0x80) === 0)
+            return value;
+        shift += 7;
+    }
+    return null;
+}
+/** 递归扫描 protobuf 消息，收集 varint 与 fixed32 字段；length-delimited 一律按嵌套消息试扫（深度 ≤4），无法解析时从字段起点 +1 重新同步。 */
+function scanGrokProtobuf(bytes, depth, path, order, scan) {
+    let index = 0;
+    let nextOrder = order;
+    while (index < bytes.length) {
+        const fieldStart = index;
+        const keyState = { index };
+        const key = readGrokVarint(bytes, keyState);
+        index = keyState.index;
+        if (key === null || key === 0) {
+            index = fieldStart + 1;
+            continue;
+        }
+        const fieldPath = [...path, Math.floor(key / 8)];
+        const wireType = key & 0x07;
+        if (wireType === 0) {
+            const valueState = { index };
+            const value = readGrokVarint(bytes, valueState);
+            if (value === null) {
+                index = fieldStart + 1;
+                continue;
+            }
+            index = valueState.index;
+            scan.varint.push({ path: fieldPath, value });
+            continue;
+        }
+        if (wireType === 1) {
+            if (index + 8 > bytes.length)
+                return nextOrder;
+            index += 8;
+            continue;
+        }
+        if (wireType === 2) {
+            const lengthState = { index };
+            const length = readGrokVarint(bytes, lengthState);
+            index = lengthState.index;
+            if (length === null || length > bytes.length - index) {
+                index = fieldStart + 1;
+                continue;
+            }
+            const end = index + length;
+            if (depth < 4)
+                nextOrder = scanGrokProtobuf(bytes.subarray(index, end), depth + 1, fieldPath, nextOrder, scan);
+            index = end;
+            continue;
+        }
+        if (wireType === 5) {
+            if (index + 4 > bytes.length)
+                return nextOrder;
+            scan.fixed32.push({ path: fieldPath, value: new DataView(bytes.buffer, bytes.byteOffset + index, 4).getFloat32(0, true), order: nextOrder });
+            nextOrder += 1;
+            index += 4;
+            continue;
+        }
+        index = fieldStart + 1;
+    }
+    return nextOrder;
+}
 function normalizeCodexSnapshot(value) {
     const root = recordValue(value);
     const source = recordValue(root?.rateLimits ?? root?.rate_limits) ?? root;
@@ -376,6 +717,65 @@ function normalizeOpenCodeSnapshot(value) {
 function hasSubscriptionWindow(value) {
     return value !== null && (value.primary !== null || value.secondary !== null || value.monthly !== null);
 }
+function defaultKimiCredentialPaths() {
+    return [
+        join(process.env.KIMI_CODE_HOME ?? join(homedir(), '.kimi-code'), 'credentials', 'kimi-code.json'),
+        join(process.env.KIMI_HOME ?? join(homedir(), '.kimi'), 'credentials', 'kimi-code.json'),
+    ];
+}
+/** 只解析 JWT payload 中的 region 字段用于选择就近接入点；签名校验由服务端负责。 */
+function kimiTokenRegion(token) {
+    const parts = token.split('.');
+    const payloadPart = parts[1];
+    if (payloadPart === undefined)
+        return null;
+    try {
+        const payload = recordValue(JSON.parse(Buffer.from(payloadPart.replace(/-/gu, '+').replace(/_/gu, '/'), 'base64').toString('utf8')));
+        return textValue(payload?.region);
+    }
+    catch {
+        return null;
+    }
+}
+function kimiCodeBaseUrls(region) {
+    const override = textValue(process.env.KIMI_CODE_BASE_URL);
+    if (override !== null)
+        return [override.replace(/\/+$/u, '')];
+    const mainland = 'https://api.kimi.com/coding/v1';
+    const global = 'https://api.kimi.ai/coding/v1';
+    return region === 'cn' ? [mainland, global] : [global, mainland];
+}
+function normalizeKimiUsage(value) {
+    const usages = recordValue(recordValue(value)?.usages);
+    if (usages === null)
+        return null;
+    const primary = normalizeKimiQuotaWindow(usages.limit_5h ?? usages.limit5h, 5 * 60);
+    const secondary = normalizeKimiQuotaWindow(usages.limit_7d ?? usages.limit7d, 7 * 24 * 60);
+    const monthly = normalizeKimiQuotaWindow(usages.limit_month_code ?? usages.limitMonthCode, null)
+        ?? normalizeKimiQuotaWindow(usages.limit_month_total ?? usages.limitMonthTotal, null);
+    if (primary === null && secondary === null && monthly === null)
+        return null;
+    return {
+        authenticated: true,
+        planType: null,
+        primary,
+        secondary,
+        monthly,
+        rateLimitReachedType: null,
+        resetCredits: null,
+        capturedAt: new Date().toISOString(),
+    };
+}
+function normalizeKimiQuotaWindow(value, windowDurationMins) {
+    const source = recordValue(value);
+    if (source === null)
+        return null;
+    const usedRatio = numberValue(source.used_ratio ?? source.usedRatio);
+    if (usedRatio === null)
+        return null;
+    const usedPercent = clamp(usedRatio * 100);
+    return { usedPercent, remainingPercent: 100 - usedPercent, windowDurationMins, resetsAt: timestampValue(source.reset_time ?? source.resetAt) };
+}
 function hasThirdPartyCodexConfig(homeDirectory) {
     const config = readText(join(homeDirectory, 'config.toml'));
     const configuredBaseUrl = config === null ? null : readCodexBaseUrl(config);

package/data/build/dist/host/cli-adapters/registry.d.ts

@@ -1,9 +1,9 @@
-import type { CodingNsAgentEvent, CodingNsAgentQuestionResponse, CodingNsCliAdapterDescriptor, CodingNsCliAdapterId, CodingNsCliModelCatalog, CodingNsAgentPermissionResponse, CodingNsCliSessionConfig, CodingNsCliSessionRecord, CodingNsCliTurnInput } from '../../shared/contracts/cli-adapter.js';
+import type { CodingNsAgentEvent, CodingNsAgentQuestionResponse, CodingNsCliAdapterDescriptor, CodingNsCliAdapterId, CodingNsCliModelCatalog, CodingNsAgentPermissionResponse, CodingNsCliSessionConfig, CodingNsCliSessionRecord, CodingNsCliTurnInput, CodingNsCliTeamDiagnostic } from '../../shared/contracts/cli-adapter.js';
 import type { CodingNsCliDriver } from './driver.js';
 import { CodingNsCliSessionStore } from './session-store.js';
 import type { CodingNsNativeSessionBridge } from '../native-session-bridge.js';
 import type { CodingNsSettings, CodingNsCliAdapterPreference } from '../../shared/contracts/config.js';
-import type { SettingsScope } from '@deepseek-ai/dsh-settings';
+import type { DshHostSettingsScope } from '../../dsh-capabilities/host/config-forms-adapter.js';
 export declare class CodingNsCliAdapterRegistry {
     private readonly drivers;
     private readonly sessions;
@@ -49,7 +49,7 @@ export declare class CodingNsCliAdapterRegistry {
         readonly modelCacheTtlMs?: number;
         readonly modelRetryTtlMs?: number;
         /** 适配器级最近模型选择的持久化设置。 */
-        readonly settings?: SettingsScope<CodingNsSettings>;
+        readonly settings?: DshHostSettingsScope<CodingNsSettings>;
     });
     private readonly sessionStore;
     private readonly nativeSessions;
@@ -63,6 +63,12 @@ export declare class CodingNsCliAdapterRegistry {
     applyEnabledSettings(settings: Readonly<Record<string, boolean>> | undefined): void;
     isEnabled(adapterId: CodingNsCliAdapterId): boolean;
     enabledSnapshot(): Record<string, boolean>;
+    /**
+     * DSH 0.2 的 Team 必须由原生 TeamService 创建 continuable child、mailbox
+     * 和 task board。当前外部 CLI 仍是独立进程，不能伪装成原生成员；统一返回
+     * 可诊断结果，避免 Client 把普通 CLI 会话误显示成 Team 成员。
+     */
+    teamDiagnostic(): CodingNsCliTeamDiagnostic;
     setSession(sessionId: string, config: CodingNsCliSessionConfig): CodingNsCliSessionConfig;
     /** 设置服务变更后重新载入适配器级默认选择。 */
     syncPreferences(value: Readonly<Record<string, CodingNsCliAdapterPreference>> | undefined): void;

package/data/build/dist/host/cli-adapters/registry.js

@@ -125,6 +125,18 @@ export class CodingNsCliAdapterRegistry {
     enabledSnapshot() {
         return Object.fromEntries(this.enabled.entries());
     }
+    /**
+     * DSH 0.2 的 Team 必须由原生 TeamService 创建 continuable child、mailbox
+     * 和 task board。当前外部 CLI 仍是独立进程，不能伪装成原生成员；统一返回
+     * 可诊断结果，避免 Client 把普通 CLI 会话误显示成 Team 成员。
+     */
+    teamDiagnostic() {
+        return {
+            supported: false,
+            code: 'DSH_TEAM_NATIVE_UNAVAILABLE',
+            message: '当前插件仅提供外部 CLI 会话适配器，尚未接入 DSH 0.2 原生 Agent Team 生命周期。',
+        };
+    }
     setSession(sessionId, config) {
         if (sessionId.trim() === '')
             throw new CodingNsRpcError('CODINGNS_CLI_INVALID_SESSION', 'sessionId 不能为空');
@@ -165,6 +177,24 @@ export class CodingNsCliAdapterRegistry {
                 : sameAdapter && !providerIdentityChanged && previous?.rawStoreRef
                     ? { rawStoreRef: previous.rawStoreRef }
                     : {}),
+            ...(config.parentSessionId?.trim()
+                ? { parentSessionId: config.parentSessionId.trim() }
+                : sameAdapter && previous?.parentSessionId ? { parentSessionId: previous.parentSessionId } : {}),
+            ...(config.origin === 'user' || config.origin === 'subagent' || config.origin === 'plugin'
+                ? { origin: config.origin }
+                : sameAdapter && previous?.origin ? { origin: previous.origin } : {}),
+            ...(config.delegationDepth !== undefined && Number.isSafeInteger(config.delegationDepth) && config.delegationDepth >= 0
+                ? { delegationDepth: config.delegationDepth }
+                : sameAdapter && previous?.delegationDepth !== undefined ? { delegationDepth: previous.delegationDepth } : {}),
+            ...(config.continuationId?.trim()
+                ? { continuationId: config.continuationId.trim() }
+                : sameAdapter && previous?.continuationId ? { continuationId: previous.continuationId } : {}),
+            ...(config.teamId?.trim()
+                ? { teamId: config.teamId.trim() }
+                : sameAdapter && previous?.teamId ? { teamId: previous.teamId } : {}),
+            ...(config.teamMemberId?.trim()
+                ? { teamMemberId: config.teamMemberId.trim() }
+                : sameAdapter && previous?.teamMemberId ? { teamMemberId: previous.teamMemberId } : {}),
         };
         this.sessions.set(sessionId, normalized);
         this.sessionStore?.upsert(sessionId, normalized);

package/data/build/dist/host/cli-adapters/session-store.d.ts

@@ -1,4 +1,4 @@
-import type { SettingsScope } from '@deepseek-ai/dsh-settings';
+import type { DshHostSettingsScope } from '../../dsh-capabilities/host/config-forms-adapter.js';
 import type { CodingNsCliAdapterId, CodingNsCliSessionConfig, CodingNsCliProviderSessionState, CodingNsCliSessionRecord, CodingNsCliSessionStatus, CodingNsSessionAdapterBinding } from '../../shared/contracts/cli-adapter.js';
 import type { CodingNsSettings } from '../../shared/contracts/config.js';
 /**
@@ -11,7 +11,7 @@ export interface CodingNsCliSessionPersistence {
     write(records: readonly CodingNsCliSessionRecord[]): Promise<void>;
 }
 export interface CodingNsCliSessionStoreOptions {
-    readonly settings?: SettingsScope<CodingNsSettings>;
+    readonly settings?: DshHostSettingsScope<CodingNsSettings>;
     readonly persistence?: CodingNsCliSessionPersistence;
 }
 export interface CodingNsCliSessionPatch {
@@ -21,6 +21,12 @@ export interface CodingNsCliSessionPatch {
     readonly providerId?: string;
     readonly providerSessionId?: string;
     readonly rawStoreRef?: string;
+    readonly parentSessionId?: string;
+    readonly origin?: CodingNsCliSessionRecord['origin'];
+    readonly delegationDepth?: number;
+    readonly continuationId?: string;
+    readonly teamId?: string;
+    readonly teamMemberId?: string;
     readonly title?: string;
     readonly cwd?: string;
     readonly status?: CodingNsCliSessionStatus;

package/data/build/dist/host/cli-adapters/session-store.js

@@ -94,6 +94,12 @@ export class CodingNsCliSessionStore {
             ...(patch.providerId?.trim() ? { providerId: patch.providerId.trim() } : base?.providerId ? { providerId: base.providerId } : {}),
             ...(providerSessionId ? { providerSessionId } : base?.providerSessionId ? { providerSessionId: base.providerSessionId } : {}),
             ...(patch.rawStoreRef?.trim() ? { rawStoreRef: patch.rawStoreRef.trim() } : providerBase?.rawStoreRef ? { rawStoreRef: providerBase.rawStoreRef } : {}),
+            ...(stringValue(patch.parentSessionId) ? { parentSessionId: stringValue(patch.parentSessionId) } : base?.parentSessionId ? { parentSessionId: base.parentSessionId } : {}),
+            ...(isSessionOrigin(patch.origin) ? { origin: patch.origin } : base?.origin ? { origin: base.origin } : {}),
+            ...(finiteNonNegativeInteger(patch.delegationDepth) ? { delegationDepth: patch.delegationDepth } : base?.delegationDepth === undefined ? {} : { delegationDepth: base.delegationDepth }),
+            ...(stringValue(patch.continuationId) ? { continuationId: stringValue(patch.continuationId) } : base?.continuationId ? { continuationId: base.continuationId } : {}),
+            ...(stringValue(patch.teamId) ? { teamId: stringValue(patch.teamId) } : base?.teamId ? { teamId: base.teamId } : {}),
+            ...(stringValue(patch.teamMemberId) ? { teamMemberId: stringValue(patch.teamMemberId) } : base?.teamMemberId ? { teamMemberId: base.teamMemberId } : {}),
             ...(patch.title?.trim() ? { title: patch.title.trim() } : base?.title ? { title: base.title } : {}),
             ...(patch.cwd?.trim() ? { cwd: patch.cwd.trim() } : base?.cwd ? { cwd: base.cwd } : {}),
             ...(patch.lastError?.trim() ? { lastError: patch.lastError.trim() } : {}),
@@ -160,6 +166,7 @@ export class CodingNsCliSessionStore {
             return;
         if (!isStatus(value.status) || typeof value.createdAt !== 'string' || typeof value.updatedAt !== 'string')
             return;
+        const origin = isSessionOrigin(value.origin) ? value.origin : undefined;
         this.records.set(value.dshSessionId, {
             dshSessionId: value.dshSessionId,
             adapterId: value.adapterId,
@@ -168,6 +175,12 @@ export class CodingNsCliSessionStore {
             ...(stringValue(value.providerId) ? { providerId: stringValue(value.providerId) } : {}),
             ...(stringValue(value.providerSessionId) ? { providerSessionId: stringValue(value.providerSessionId) } : {}),
             ...(stringValue(value.rawStoreRef) ? { rawStoreRef: stringValue(value.rawStoreRef) } : {}),
+            ...(stringValue(value.parentSessionId) ? { parentSessionId: stringValue(value.parentSessionId) } : {}),
+            ...(origin === undefined ? {} : { origin }),
+            ...(finiteNonNegativeInteger(value.delegationDepth) ? { delegationDepth: value.delegationDepth } : {}),
+            ...(stringValue(value.continuationId) ? { continuationId: stringValue(value.continuationId) } : {}),
+            ...(stringValue(value.teamId) ? { teamId: stringValue(value.teamId) } : {}),
+            ...(stringValue(value.teamMemberId) ? { teamMemberId: stringValue(value.teamMemberId) } : {}),
             ...(stringValue(value.title) ? { title: stringValue(value.title) } : {}),
             ...(stringValue(value.cwd) ? { cwd: stringValue(value.cwd) } : {}),
             ...(stringValue(value.lastError) ? { lastError: stringValue(value.lastError) } : {}),
@@ -212,6 +225,12 @@ function isProviderState(value) {
 function stringValue(value) {
     return typeof value === 'string' && value.trim() !== '' ? value : undefined;
 }
+function isSessionOrigin(value) {
+    return value === 'user' || value === 'subagent' || value === 'plugin';
+}
+function finiteNonNegativeInteger(value) {
+    return typeof value === 'number' && Number.isSafeInteger(value) && value >= 0;
+}
 function isRecord(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }