@a1hvdy/cc-openclaw 0.10.4 → 0.12.0

package/dist/src/command-router/resume-policy.js

@@ -0,0 +1,236 @@
+/**
+ * resume-policy — /cc+ continuation, /cc resume, rehydrate, and turn-extension logic.
+ *
+ * Extracted from cc-handler.ts (Step 4 of Phase 5 v0.11.0 decomposition).
+ * Each public function takes PolicyDeps as its first argument per PRP §7 Q3.
+ * cc-handler.ts retains ownership of the sessionManager/activeSessions/logger
+ * singletons and threads them in via `_deps()` on every call.
+ *
+ * Callers MUST verify `sessionManager !== null` before constructing deps:
+ * PolicyDeps.sessionManager is typed non-null and these handlers assume it.
+ * The "Claude Code handler not ready — try again in a few seconds." response
+ * is now produced at the dispatcher in cc-handler.ts.
+ */
+import { DEFAULT_CWD, sessionMapKey, saveSession, loadSession, loadSessionById, scanAllSessions, IDLE_TIMEOUT_MS, ACK_TIMEOUT_MS, scheduleIdle, _postTurnContextCheck, } from './launch-policy.js';
+import { sendDirectReply } from './turn-formatter.js';
+const PLUGIN_TAG = '[cc-openclaw/resume-policy]';
+// ── Continuation Handler ──────────────────────────────────────────────────
+export function handleContinuation(deps, prompt, chatId, threadId) {
+    const { sessionManager, activeSessions, logger } = deps;
+    const key = sessionMapKey(chatId, threadId);
+    const active = activeSessions.get(key);
+    if (!active) {
+        return {
+            handled: true,
+            text: 'No active session to continue. Start one with /cc <prompt> or /cc resume',
+        };
+    }
+    if (active.needsRehydration) {
+        if (!active.meta.claudeSessionId) {
+            activeSessions.delete(key);
+            return {
+                handled: true,
+                text: 'Recovered session has no Claude ID — start fresh with /cc <prompt>',
+            };
+        }
+        logger.info(`${PLUGIN_TAG} /cc+ rehydrating recovered session: slug=${active.slug} chat=${chatId} thread=${threadId || 'none'}`);
+        let resolveAckId;
+        const ackIdPromise = new Promise((r) => {
+            resolveAckId = r;
+        });
+        (async () => {
+            try {
+                await rehydrateSession(deps, active.meta, chatId, threadId);
+                active.needsRehydration = false;
+                await continueTurn(deps, active, prompt, chatId, threadId, ackIdPromise);
+            }
+            catch (err) {
+                logger.error(`${PLUGIN_TAG} Rehydrate+continue ${active.slug} failed: ${err instanceof Error ? err.message : String(err)}`);
+                scheduleIdle(deps, key, active);
+            }
+        })();
+        return {
+            handled: true,
+            text: `⏳ [${active.meta.id || '?'}] Resuming & continuing ${active.slug}...`,
+            _resolveAckId: resolveAckId,
+        };
+    }
+    try {
+        sessionManager.getStatus(active.sessionName);
+    }
+    catch {
+        activeSessions.delete(key);
+        return {
+            handled: true,
+            text: 'Previous session expired. Use /cc resume or start fresh with /cc <prompt>',
+        };
+    }
+    if (active.idleTimer)
+        clearTimeout(active.idleTimer);
+    logger.info(`${PLUGIN_TAG} /cc+ continuation: slug=${active.slug} chat=${chatId} thread=${threadId || 'none'}`);
+    let resolveAckId;
+    const ackIdPromise = new Promise((r) => {
+        resolveAckId = r;
+    });
+    continueTurn(deps, active, prompt, chatId, threadId, ackIdPromise).catch((err) => {
+        logger.error(`${PLUGIN_TAG} Continuation ${active.slug} failed: ${err instanceof Error ? err.message : String(err)}`);
+        scheduleIdle(deps, key, active);
+    });
+    return {
+        handled: true,
+        text: `⏳ [${active.meta.id || '?'}] Continuing ${active.slug}...`,
+        _resolveAckId: resolveAckId,
+    };
+}
+// ── Resume Handler ────────────────────────────────────────────────────────
+export function handleResume(deps, chatId, threadId, targetSlug) {
+    const { activeSessions, logger } = deps;
+    const key = sessionMapKey(chatId, threadId);
+    const currentActive = activeSessions.get(key);
+    if (currentActive) {
+        return {
+            handled: true,
+            text: `Already have active session: ${currentActive.slug}\nUse /cc stop first, or /cc+ to continue it.`,
+        };
+    }
+    let meta = null;
+    if (targetSlug) {
+        const isSessionId = /^[0-9a-f]{8}$/i.test(targetSlug);
+        if (isSessionId) {
+            meta = loadSessionById(targetSlug.toLowerCase());
+        }
+        if (!meta) {
+            meta = loadSession(targetSlug);
+        }
+        if (!meta) {
+            return { handled: true, text: `Session "${targetSlug}" not found.` };
+        }
+        if (meta.chatId !== chatId) {
+            return {
+                handled: true,
+                text: `Session "${targetSlug}" belongs to a different chat.`,
+            };
+        }
+    }
+    else {
+        const candidates = scanAllSessions()
+            .filter((s) => s.chatId === chatId &&
+            (s.threadId || undefined) === (threadId || undefined) &&
+            !!s.claudeSessionId)
+            .sort((a, b) => {
+            const timeA = new Date(a.lastContinuedAt || a.completedAt || a.startedAt).getTime();
+            const timeB = new Date(b.lastContinuedAt || b.completedAt || b.startedAt).getTime();
+            return timeB - timeA;
+        });
+        if (candidates.length === 0) {
+            return {
+                handled: true,
+                text: 'No resumable session found. Start fresh with /cc <prompt>',
+            };
+        }
+        meta = candidates[0];
+    }
+    if (!meta.claudeSessionId) {
+        return {
+            handled: true,
+            text: `Session ${meta.slug} has no Claude session ID — cannot resume.\nStart fresh with /cc <prompt>`,
+        };
+    }
+    const { slug, id: resumeId } = meta;
+    logger.info(`${PLUGIN_TAG} /cc resume: id=${resumeId} slug=${slug} claudeId=${meta.claudeSessionId} chat=${chatId} thread=${threadId || 'none'}`);
+    rehydrateSession(deps, meta, chatId, threadId).catch((err) => {
+        logger.error(`${PLUGIN_TAG} Resume ${slug} failed: ${err instanceof Error ? err.message : String(err)}`);
+        meta.state = 'failed';
+        meta.error = `Resume failed: ${err instanceof Error ? err.message : String(err)}`;
+        try {
+            saveSession(meta);
+        }
+        catch { /* best effort */ }
+        const active = activeSessions.get(key);
+        if (active?.slug === slug) {
+            if (active.idleTimer)
+                clearTimeout(active.idleTimer);
+            activeSessions.delete(key);
+        }
+    });
+    return { handled: true, text: `⏳ [${resumeId || '?'}] Resuming ${slug}...` };
+}
+// ── Rehydrate Session ─────────────────────────────────────────────────────
+export async function rehydrateSession(deps, meta, chatId, threadId) {
+    const { sessionManager, activeSessions, logger } = deps;
+    const { slug, sessionName, claudeSessionId } = meta;
+    const key = sessionMapKey(chatId, threadId);
+    logger.info(`${PLUGIN_TAG} Rehydrating ${sessionName} with claudeSessionId=${claudeSessionId}...`);
+    await sessionManager.startSession({
+        name: sessionName,
+        cwd: meta.cwd || DEFAULT_CWD,
+        engine: 'claude',
+        permissionMode: 'bypassPermissions',
+        effort: 'high',
+        resumeSessionId: claudeSessionId,
+    });
+    const prevActive = activeSessions.get(key);
+    if (prevActive && prevActive.sessionName !== sessionName) {
+        if (prevActive.idleTimer)
+            clearTimeout(prevActive.idleTimer);
+        try {
+            await sessionManager.stopSession(prevActive.sessionName);
+        }
+        catch { /* ignore */ }
+    }
+    meta.state = 'idle';
+    meta.threadId = threadId;
+    meta.lastContinuedAt = new Date().toISOString();
+    try {
+        saveSession(meta);
+    }
+    catch { /* best effort */ }
+    const activeEntry = { sessionName, slug, meta, idleTimer: null };
+    activeSessions.set(key, activeEntry);
+    logger.info(`${PLUGIN_TAG} Session ${sessionName} resumed — idle for ${IDLE_TIMEOUT_MS / 1000}s`);
+    scheduleIdle(deps, key, activeEntry);
+}
+// ── Continuation Turn ─────────────────────────────────────────────────────
+export async function continueTurn(deps, active, prompt, chatId, threadId, ackIdPromise) {
+    const { sessionManager, logger } = deps;
+    const { sessionName, meta } = active;
+    const key = sessionMapKey(chatId, threadId);
+    meta.state = 'running';
+    try {
+        saveSession(meta);
+    }
+    catch { /* best effort */ }
+    const opts = { telegramChatId: chatId };
+    if (threadId)
+        opts.telegramThreadId = threadId;
+    const ackMsgId = await Promise.race([
+        ackIdPromise,
+        new Promise((r) => setTimeout(() => r(null), ACK_TIMEOUT_MS)),
+    ]);
+    if (ackMsgId)
+        opts.telegramAckMessageId = ackMsgId;
+    const result = await sessionManager.sendMessage(sessionName, prompt, opts);
+    meta.state = 'idle';
+    meta.turns = (meta.turns || 1) + 1;
+    meta.lastContinuedAt = new Date().toISOString();
+    meta.output = (result?.output || '').slice(0, 2000);
+    meta.claudeSessionId = result?.sessionId ?? meta.claudeSessionId;
+    try {
+        saveSession(meta);
+    }
+    catch { /* best effort */ }
+    // v0.6.0: post-turn context-pressure check (continuation turn).
+    void _postTurnContextCheck(deps, sessionName, chatId, threadId);
+    // 2026-05-07 FIX — direct answer delivery (continuation turn).
+    if (result?.output && chatId) {
+        try {
+            await sendDirectReply(chatId, threadId, result.output, logger);
+        }
+        catch (e) {
+            logger.warn(`${PLUGIN_TAG} Direct answer delivery failed for ${sessionName} (continuation): ${e instanceof Error ? e.message : String(e)}`);
+        }
+    }
+    logger.info(`${PLUGIN_TAG} Session ${sessionName} turn ${meta.turns} complete`);
+    scheduleIdle(deps, key, active);
+}
+//# sourceMappingURL=resume-policy.js.map

package/dist/src/command-router/resume-policy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resume-policy.js","sourceRoot":"","sources":["../../../src/command-router/resume-policy.ts"],"names":[],"mappings":"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"}

package/dist/src/command-router/turn-formatter.d.ts

@@ -0,0 +1,19 @@
+/**
+ * turn-formatter — Telegram direct-send + observability formatting helpers.
+ *
+ * Extracted from cc-handler.ts (Step 1 of Phase 5 v0.11.0 decomposition).
+ * Contains: loadBotToken, telegramApiDirect, sendDirectReply,
+ *           buildPhase2FlagsLine, buildObservabilityLines.
+ */
+export declare function loadBotToken(logger?: Console): void;
+export declare function sendDirectReply(chatId: string, threadId: string | undefined, text: string, logger?: Console): Promise<number | null>;
+/** Returns the current BOT_TOKEN (for callers that need to check if it's set). */
+export declare function hasBotToken(): boolean;
+export declare function buildPhase2FlagsLine(): string;
+/**
+ * Pillar C v0.4.0 — compose observability lines for /cc status panel.
+ * Reads from Pillar A metrics, Pillar B trajectory tail, and status-tee
+ * quota snapshot. Each source is independently fault-tolerant: if one
+ * fails, the line shows "?" rather than crashing the panel.
+ */
+export declare function buildObservabilityLines(): string;

package/dist/src/command-router/turn-formatter.js

@@ -0,0 +1,144 @@
+/**
+ * turn-formatter — Telegram direct-send + observability formatting helpers.
+ *
+ * Extracted from cc-handler.ts (Step 1 of Phase 5 v0.11.0 decomposition).
+ * Contains: loadBotToken, telegramApiDirect, sendDirectReply,
+ *           buildPhase2FlagsLine, buildObservabilityLines.
+ */
+import * as fs from 'node:fs';
+import { request as httpsRequest } from 'node:https';
+const PLUGIN_TAG = '[cc-openclaw/command-router]';
+const OPENCLAW_CONFIG_PATH = '/home/a1xai/.openclaw/openclaw.json';
+// ── Telegram Direct Send ──────────────────────────────────────────────────
+let BOT_TOKEN = '';
+export function loadBotToken(logger = console) {
+    if (BOT_TOKEN)
+        return;
+    try {
+        const raw = fs.readFileSync(OPENCLAW_CONFIG_PATH, 'utf8');
+        const cfg = JSON.parse(raw);
+        const tg = cfg.channels?.telegram;
+        if (tg?.accounts) {
+            const acctKey = tg.defaultAccount || 'default';
+            const acct = tg.accounts[acctKey] || {};
+            BOT_TOKEN = acct.botToken || '';
+        }
+        if (BOT_TOKEN)
+            logger.info(`${PLUGIN_TAG} Bot token loaded for direct replies`);
+    }
+    catch (err) {
+        logger.warn(`${PLUGIN_TAG} Failed to load bot token: ${err instanceof Error ? err.message : String(err)}`);
+    }
+}
+function telegramApiDirect(method, params) {
+    return new Promise((resolve, reject) => {
+        const body = JSON.stringify(params);
+        const options = {
+            hostname: 'api.telegram.org',
+            path: `/bot${BOT_TOKEN}/${method}`,
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'Content-Length': Buffer.byteLength(body),
+            },
+        };
+        const req = httpsRequest(options, (res) => {
+            let data = '';
+            res.on('data', (chunk) => (data += chunk));
+            res.on('end', () => {
+                try {
+                    resolve(JSON.parse(data));
+                }
+                catch {
+                    resolve({ ok: false });
+                }
+            });
+        });
+        req.on('error', reject);
+        req.setTimeout(10_000, () => req.destroy(new Error('Telegram API timeout')));
+        req.write(body);
+        req.end();
+    });
+}
+export async function sendDirectReply(chatId, threadId, text, logger = console) {
+    if (!BOT_TOKEN || !chatId)
+        return null;
+    try {
+        const params = {
+            chat_id: chatId,
+            text,
+            disable_web_page_preview: true,
+        };
+        if (threadId)
+            params.message_thread_id = Number(threadId);
+        const res = await telegramApiDirect('sendMessage', params);
+        if (!res.ok) {
+            logger.warn(`${PLUGIN_TAG} Direct reply failed: ${JSON.stringify(res.description || res)}`);
+            return null;
+        }
+        return res.result?.message_id ?? null;
+    }
+    catch (err) {
+        logger.warn(`${PLUGIN_TAG} Direct reply error: ${err instanceof Error ? err.message : String(err)}`);
+        return null;
+    }
+}
+/** Returns the current BOT_TOKEN (for callers that need to check if it's set). */
+export function hasBotToken() {
+    return BOT_TOKEN !== '';
+}
+// ── Phase 2 Flags ─────────────────────────────────────────────────────────
+export function buildPhase2FlagsLine() {
+    const allowBuiltins = process.env.CC_OPENCLAW_ALLOW_BUILTINS === '1';
+    const toolStream = process.env.CC_OPENCLAW_TOOL_STREAM === '1';
+    return `Flags: builtins=${allowBuiltins ? 'on' : 'off'} | toolstream=${toolStream ? 'on' : 'off'}`;
+}
+// ── Observability Lines ───────────────────────────────────────────────────
+/**
+ * Pillar C v0.4.0 — compose observability lines for /cc status panel.
+ * Reads from Pillar A metrics, Pillar B trajectory tail, and status-tee
+ * quota snapshot. Each source is independently fault-tolerant: if one
+ * fails, the line shows "?" rather than crashing the panel.
+ */
+export function buildObservabilityLines() {
+    const lines = [];
+    // Plan quota (status-tee)
+    try {
+        // Lazy require so this file remains testable without status-tee
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
+        const { readQuotaSnapshot, formatQuotaLine } = require('../lib/status-tee-reader.js');
+        lines.push(formatQuotaLine(readQuotaSnapshot()));
+    }
+    catch {
+        lines.push('Plan: ?%');
+    }
+    // Workers + uptime + last error (Pillar A metrics)
+    try {
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
+        const { metricsRegistry } = require('../health/metrics.js');
+        const out = metricsRegistry.serializePrometheus();
+        const workersMatch = /cc_openclaw_workers (\d+)/.exec(out);
+        const uptimeMatch = /cc_openclaw_uptime_seconds (\d+)/.exec(out);
+        const lastErrMatch = /cc_openclaw_last_error_seconds (\d+)/.exec(out);
+        const errorsMatch = /cc_openclaw_errors_total (\d+)/.exec(out);
+        const workers = workersMatch ? workersMatch[1] : '?';
+        const uptime = uptimeMatch ? Math.floor(parseInt(uptimeMatch[1], 10) / 60) : '?';
+        lines.push(`Workers: ${workers} | Uptime: ${uptime}m`);
+        const errCount = errorsMatch ? parseInt(errorsMatch[1], 10) : 0;
+        const lastErrTs = lastErrMatch ? parseInt(lastErrMatch[1], 10) : 0;
+        if (errCount === 0 || lastErrTs === 0) {
+            lines.push('Last error: none');
+        }
+        else {
+            const agoSec = Math.floor(Date.now() / 1000) - lastErrTs;
+            const agoLabel = agoSec < 60 ? `${agoSec}s` : agoSec < 3600 ? `${Math.floor(agoSec / 60)}m` : `${Math.floor(agoSec / 3600)}h`;
+            lines.push(`Last error: ${agoLabel} ago (${errCount} total)`);
+        }
+    }
+    catch {
+        lines.push('Workers: ? | Uptime: ?');
+        lines.push('Last error: ?');
+    }
+    return lines.join('\n');
+}
+//# sourceMappingURL=turn-formatter.js.map

package/dist/src/command-router/turn-formatter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-formatter.js","sourceRoot":"","sources":["../../../src/command-router/turn-formatter.ts"],"names":[],"mappings":"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"}

package/dist/src/config/drift-detector.d.ts

@@ -0,0 +1,28 @@
+/**
+ * drift-detector — snapshots the parsed Config to disk on a healthy boot;
+ * compares on subsequent boots and returns a delta list.
+ *
+ * Primary purpose: detect keys pruned by `openclaw doctor --fix`
+ * (OF5 — feedback_cc_openclaw_provider_timeout.md).
+ *
+ * Snapshot path: ~/.openclaw/workspace/memory/cc-openclaw-config-snapshot.json
+ * The file is written atomically (write-then-rename is not available in pure
+ * Node ESM without extra deps; we write directly since the worst case is a
+ * corrupted snapshot — non-fatal; falls back to empty baseline).
+ */
+import type { Config } from './schema.js';
+export interface ConfigDelta {
+    path: string;
+    previous: unknown;
+    current: unknown;
+}
+/**
+ * Compare current config against the on-disk snapshot.
+ * Returns an array of changed paths (empty = no drift).
+ */
+export declare function detectDrift(current: Config): ConfigDelta[];
+/**
+ * Persist current config as the baseline snapshot for future drift detection.
+ * Called at the end of a successful boot (after phase 7 / ready state).
+ */
+export declare function saveSnapshot(current: Config): void;

package/dist/src/config/drift-detector.js

@@ -0,0 +1,75 @@
+/**
+ * drift-detector — snapshots the parsed Config to disk on a healthy boot;
+ * compares on subsequent boots and returns a delta list.
+ *
+ * Primary purpose: detect keys pruned by `openclaw doctor --fix`
+ * (OF5 — feedback_cc_openclaw_provider_timeout.md).
+ *
+ * Snapshot path: ~/.openclaw/workspace/memory/cc-openclaw-config-snapshot.json
+ * The file is written atomically (write-then-rename is not available in pure
+ * Node ESM without extra deps; we write directly since the worst case is a
+ * corrupted snapshot — non-fatal; falls back to empty baseline).
+ */
+import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
+import { homedir } from 'os';
+import { join, dirname } from 'path';
+const SNAPSHOT_PATH = join(homedir(), '.openclaw', 'workspace', 'memory', 'cc-openclaw-config-snapshot.json');
+// ── Internal helpers ──────────────────────────────────────────────────────────
+function flattenConfig(obj, prefix = '') {
+    if (obj === null || typeof obj !== 'object') {
+        return { [prefix]: obj };
+    }
+    const result = {};
+    for (const [k, v] of Object.entries(obj)) {
+        const key = prefix ? `${prefix}.${k}` : k;
+        if (v !== null && typeof v === 'object' && !Array.isArray(v)) {
+            Object.assign(result, flattenConfig(v, key));
+        }
+        else {
+            result[key] = v;
+        }
+    }
+    return result;
+}
+function readSnapshot() {
+    if (!existsSync(SNAPSHOT_PATH))
+        return {};
+    try {
+        const raw = readFileSync(SNAPSHOT_PATH, 'utf8');
+        return JSON.parse(raw);
+    }
+    catch {
+        return {};
+    }
+}
+// ── Public API ────────────────────────────────────────────────────────────────
+/**
+ * Compare current config against the on-disk snapshot.
+ * Returns an array of changed paths (empty = no drift).
+ */
+export function detectDrift(current) {
+    const previous = readSnapshot();
+    const flat = flattenConfig(current);
+    const deltas = [];
+    for (const [path, value] of Object.entries(flat)) {
+        if (path in previous && JSON.stringify(previous[path]) !== JSON.stringify(value)) {
+            deltas.push({ path, previous: previous[path], current: value });
+        }
+    }
+    return deltas;
+}
+/**
+ * Persist current config as the baseline snapshot for future drift detection.
+ * Called at the end of a successful boot (after phase 7 / ready state).
+ */
+export function saveSnapshot(current) {
+    try {
+        mkdirSync(dirname(SNAPSHOT_PATH), { recursive: true });
+        const flat = flattenConfig(current);
+        writeFileSync(SNAPSHOT_PATH, JSON.stringify(flat, null, 2), 'utf8');
+    }
+    catch {
+        // Non-fatal: drift detection degrades to "no baseline" on next boot.
+    }
+}
+//# sourceMappingURL=drift-detector.js.map

package/dist/src/config/drift-detector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"drift-detector.js","sourceRoot":"","sources":["../../../src/config/drift-detector.ts"],"names":[],"mappings":"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"}

package/dist/src/config/loader.d.ts

@@ -0,0 +1,8 @@
+/**
+ * loadConfigSources — reads env vars + ~/.openclaw/openclaw.json, returns a
+ * raw object for ConfigSchema.parse().
+ *
+ * Does NOT throw on missing files — caller receives defaults via zod.
+ * Throws ConfigInvalid only when ConfigSchema.parse() rejects (via boot phase 1).
+ */
+export declare function loadConfigSources(): Record<string, unknown>;

package/dist/src/config/loader.js

@@ -0,0 +1,69 @@
+/**
+ * loadConfigSources — reads env vars + ~/.openclaw/openclaw.json, returns a
+ * raw object for ConfigSchema.parse().
+ *
+ * Does NOT throw on missing files — caller receives defaults via zod.
+ * Throws ConfigInvalid only when ConfigSchema.parse() rejects (via boot phase 1).
+ */
+import { existsSync, readFileSync } from 'fs';
+import { homedir } from 'os';
+import { join } from 'path';
+const OPENCLAW_JSON_PATH = join(homedir(), '.openclaw', 'openclaw.json');
+function readOpenClawJson() {
+    if (!existsSync(OPENCLAW_JSON_PATH))
+        return {};
+    try {
+        const raw = readFileSync(OPENCLAW_JSON_PATH, 'utf8');
+        return JSON.parse(raw);
+    }
+    catch {
+        return {};
+    }
+}
+function parseBoolEnv(key, fallback = false) {
+    const val = process.env[key];
+    if (val === undefined)
+        return fallback;
+    return val === '1' || val === 'true';
+}
+function parseIntEnv(key, fallback) {
+    const val = process.env[key];
+    if (val === undefined)
+        return fallback;
+    const n = parseInt(val, 10);
+    return isNaN(n) ? fallback : n;
+}
+// ── Main ──────────────────────────────────────────────────────────────────────
+export function loadConfigSources() {
+    const oclJson = readOpenClawJson();
+    // Extract timeoutSeconds from models.providers["cc-openclaw"].timeoutSeconds
+    const ccProvider = oclJson.models?.providers?.['cc-openclaw'];
+    const timeoutSeconds = ccProvider?.timeoutSeconds ??
+        parseIntEnv('CC_OPENCLAW_TIMEOUT_SECONDS');
+    // Extract fallback chain from agents.defaults.model.fallbacks
+    const fallbackChain = oclJson.agents?.defaults?.model?.fallbacks ?? [];
+    return {
+        openclawCcOpenclawActive: parseBoolEnv('OPENCLAW_CC_OPENCLAW_ACTIVE'),
+        openclawCcOpenclawListeners: parseBoolEnv('OPENCLAW_CC_OPENCLAW_LISTENERS'),
+        ccOpenclaw: {
+            nativeTools: {
+                enabled: parseBoolEnv('CC_OPENCLAW_NATIVE_TOOLS', true),
+                // allowList not env-driven; comes from schema default (Q1)
+            },
+            stalledKillMs: parseIntEnv('CC_OPENCLAW_STALLED_KILL_MS'),
+            loopMaxSubprocs: parseIntEnv('CC_OPENCLAW_LOOP_MAX_SUBPROCS'),
+            cacheParity: parseBoolEnv('OPENCLAW_CACHE_PARITY', true),
+            ttsAutoMode: process.env['OPENCLAW_TTS_AUTO_MODE'],
+        },
+        openclawJson: {
+            timeoutSeconds,
+            messagesTts: {
+                timeoutMs: oclJson.messages?.tts?.timeoutMs,
+                maxTextLength: oclJson.messages?.tts?.maxTextLength,
+            },
+            fallbackChain,
+            pluginsAllow: oclJson.plugins?.allow ?? [],
+        },
+    };
+}
+//# sourceMappingURL=loader.js.map

package/dist/src/config/loader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/config/loader.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;AA0BzE,SAAS,gBAAgB;IACvB,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAAE,OAAO,EAAE,CAAC;IAC/C,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,YAAY,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;QACrD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAsB,CAAC;IAC9C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,GAAW,EAAE,QAAQ,GAAG,KAAK;IACjD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IACvC,OAAO,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,MAAM,CAAC;AACvC,CAAC;AAED,SAAS,WAAW,CAAC,GAAW,EAAE,QAAiB;IACjD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IACvC,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC5B,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AACjC,CAAC;AAED,iFAAiF;AAEjF,MAAM,UAAU,iBAAiB;IAC/B,MAAM,OAAO,GAAG,gBAAgB,EAAE,CAAC;IAEnC,6EAA6E;IAC7E,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,aAAa,CAAC,CAAC;IAC9D,MAAM,cAAc,GAClB,UAAU,EAAE,cAAc;QAC1B,WAAW,CAAC,6BAA6B,CAAC,CAAC;IAE7C,8DAA8D;IAC9D,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,IAAI,EAAE,CAAC;IAEvE,OAAO;QACL,wBAAwB,EAAE,YAAY,CAAC,6BAA6B,CAAC;QACrE,2BAA2B,EAAE,YAAY,CAAC,gCAAgC,CAAC;QAC3E,UAAU,EAAE;YACV,WAAW,EAAE;gBACX,OAAO,EAAE,YAAY,CAAC,0BAA0B,EAAE,IAAI,CAAC;gBACvD,2DAA2D;aAC5D;YACD,aAAa,EAAE,WAAW,CAAC,6BAA6B,CAAC;YACzD,eAAe,EAAE,WAAW,CAAC,+BAA+B,CAAC;YAC7D,WAAW,EAAE,YAAY,CAAC,uBAAuB,EAAE,IAAI,CAAC;YACxD,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;SACnD;QACD,YAAY,EAAE;YACZ,cAAc;YACd,WAAW,EAAE;gBACX,SAAS,EAAE,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,SAAS;gBAC3C,aAAa,EAAE,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,aAAa;aACpD;YACD,aAAa;YACb,YAAY,EAAE,OAAO,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;SAC3C;KACF,CAAC;AACJ,CAAC"}