shennian 0.2.88 → 0.2.90

package/dist/src/native-fusion/service.d.ts

@@ -1,4 +1,5 @@
 import type { CliRelayClient } from '../relay/client.js';
+import type { SessionActivitySnapshot } from '@shennian/wire';
 export declare class NativeSessionFusionService {
     private client;
     private timer;
@@ -20,6 +21,15 @@ export declare class NativeSessionFusionService {
     noteManagedSourceSession(sessionId: string, agentType: string, sourceSessionKey: string | null): void;
     private pruneState;
     scanNow(): Promise<void>;
+    getCodexThreadActivity(params: {
+        sessionId: string;
+        threadId: string;
+        workDir?: string;
+    }): Promise<SessionActivitySnapshot | null | undefined>;
+    interruptCodexThread(params: {
+        threadId: string;
+        workDir?: string;
+    }): Promise<boolean>;
     private runScan;
     private tryClaimManagedEcho;
     private isSuppressed;

package/dist/src/native-fusion/service.js

@@ -1,198 +1,2 @@
-// @arch docs/architecture/cli/native-session-fusion.md
-// @test src/__tests__/native-fusion-parsers.test.ts
-import { randomUUID } from 'node:crypto';
-import fs from 'node:fs';
-import { listClaudeTranscriptFiles, listCodexRolloutFiles, listOpenCodeSessionFiles, parseClaudeTranscriptChunk, parseCodexRolloutChunk, parseOpenCodeSessionFile, } from './parsers.js';
-import { loadNativeScannerState, saveNativeScannerState } from './state.js';
-const SCAN_INTERVAL_MS = 60_000;
-const CLAIM_TTL_MS = SCAN_INTERVAL_MS * 2;
-const MANAGED_RUN_SUPPRESSION_TTL_MS = 30 * 60_000;
-const MAX_BATCH_SIZE = 20;
-function normalizeText(text) {
-    return text.replace(/\r\n/g, '\n').trim();
-}
-function isCodexRolloutPath(filePath) {
-    return filePath.split(/[\\/]+/).includes('.codex');
-}
-export class NativeSessionFusionService {
-    client;
-    timer = null;
-    scanPromise = null;
-    pendingClaims = new Map();
-    suppressionWindows = new Map();
-    constructor(client) {
-        this.client = client;
-    }
-    start() {
-        if (this.timer)
-            return;
-        this.timer = setInterval(() => {
-            void this.scanNow().catch((error) => {
-                console.error('[native-fusion] periodic scan failed', error);
-            });
-        }, SCAN_INTERVAL_MS);
-    }
-    stop() {
-        if (this.timer)
-            clearInterval(this.timer);
-        this.timer = null;
-    }
-    handleConnected() {
-        this.start();
-        void this.scanNow().catch((error) => {
-            console.error('[native-fusion] initial scan failed', error);
-        });
-    }
-    registerManagedSend(params) {
-        if (!params.canonicalMessageId)
-            return;
-        const sourceAgentType = params.sourceAgentType ?? params.agentType;
-        if (sourceAgentType !== 'codex' && sourceAgentType !== 'claude' && sourceAgentType !== 'opencode')
-            return;
-        this.pendingClaims.set(params.sessionId, {
-            sessionId: params.sessionId,
-            agentType: params.agentType,
-            sourceAgentType,
-            canonicalMessageId: params.canonicalMessageId,
-            text: normalizeText(params.text),
-            createdAt: Date.now(),
-            expiresAt: Date.now() + CLAIM_TTL_MS,
-            sourceSessionKey: params.sourceSessionKey ?? null,
-        });
-    }
-    noteManagedSourceSession(sessionId, agentType, sourceSessionKey) {
-        if (!sourceSessionKey)
-            return;
-        const claim = this.pendingClaims.get(sessionId);
-        if (claim && claim.sourceAgentType === agentType) {
-            claim.sourceSessionKey = sourceSessionKey;
-        }
-    }
-    pruneState() {
-        const now = Date.now();
-        for (const [sessionId, claim] of this.pendingClaims.entries()) {
-            if (claim.expiresAt <= now)
-                this.pendingClaims.delete(sessionId);
-        }
-        for (const [key, window] of this.suppressionWindows.entries()) {
-            if (window.endsAt <= now)
-                this.suppressionWindows.delete(key);
-        }
-    }
-    async scanNow() {
-        if (this.client.getState() !== 'connected')
-            return;
-        if (this.scanPromise)
-            return this.scanPromise;
-        this.scanPromise = this.runScan().finally(() => {
-            this.scanPromise = null;
-        });
-        return this.scanPromise;
-    }
-    async runScan() {
-        this.pruneState();
-        const state = loadNativeScannerState();
-        const nextFilesState = { ...state.files };
-        const batches = [];
-        const files = [...listCodexRolloutFiles(), ...listClaudeTranscriptFiles(), ...listOpenCodeSessionFiles()];
-        for (const filePath of files) {
-            const stat = fs.statSync(filePath);
-            const current = state.files[filePath];
-            if (!current) {
-                nextFilesState[filePath] = {
-                    offset: stat.size,
-                    mtimeMs: stat.mtimeMs,
-                };
-                continue;
-            }
-            const isCodex = isCodexRolloutPath(filePath);
-            const isOpenCode = filePath.endsWith('.opencode-session.json');
-            const startOffset = isOpenCode && current?.mtimeMs !== stat.mtimeMs
-                ? current.offset
-                : current?.offset ?? 0;
-            const parsed = isOpenCode
-                ? parseOpenCodeSessionFile(filePath, startOffset)
-                : isCodex
-                    ? parseCodexRolloutChunk(filePath, startOffset)
-                    : parseClaudeTranscriptChunk(filePath, startOffset);
-            nextFilesState[filePath] = {
-                offset: parsed.nextOffset,
-                mtimeMs: stat.mtimeMs,
-            };
-            for (const event of parsed.events) {
-                const claimed = this.tryClaimManagedEcho(event);
-                if (claimed) {
-                    batches.push(claimed);
-                    continue;
-                }
-                if (this.isSuppressed(event))
-                    continue;
-                batches.push(event);
-            }
-        }
-        for (let index = 0; index < batches.length; index += MAX_BATCH_SIZE) {
-            const chunk = batches.slice(index, index + MAX_BATCH_SIZE);
-            if (chunk.length === 0)
-                continue;
-            const wireEvents = chunk.map(({ repairHint: _repairHint, ...event }) => event);
-            await this.client.sendBufferedEvent({
-                type: 'event',
-                event: 'native.session.events',
-                id: `native-fusion-${randomUUID()}`,
-                payload: { events: wireEvents },
-            }, 60_000);
-        }
-        state.files = nextFilesState;
-        saveNativeScannerState(state);
-    }
-    tryClaimManagedEcho(event) {
-        const now = Date.now();
-        for (const [sessionId, claim] of this.pendingClaims.entries()) {
-            if (claim.sourceAgentType !== event.agentType)
-                continue;
-            if (claim.expiresAt <= now)
-                continue;
-            if (event.role !== 'user')
-                continue;
-            if (!claim.sourceSessionKey)
-                continue;
-            if (claim.sourceSessionKey !== event.sourceSessionKey)
-                continue;
-            if (Math.abs(event.ts - claim.createdAt) > CLAIM_TTL_MS)
-                continue;
-            if (normalizeText(event.payload) !== claim.text)
-                continue;
-            this.pendingClaims.delete(sessionId);
-            this.suppressionWindows.set(`${event.agentType}:${event.sourceSessionKey}`, {
-                sessionId,
-                agentType: event.agentType,
-                sourceSessionKey: event.sourceSessionKey,
-                startedAt: event.ts,
-                endsAt: Math.max(now, event.ts) + MANAGED_RUN_SUPPRESSION_TTL_MS,
-            });
-            return {
-                ...event,
-                sourceMode: 'managed_echo_claim',
-                claimCanonicalMessageId: claim.canonicalMessageId,
-            };
-        }
-        return null;
-    }
-    isSuppressed(event) {
-        const key = `${event.agentType}:${event.sourceSessionKey}`;
-        const window = this.suppressionWindows.get(key);
-        if (!window)
-            return false;
-        if (event.ts < window.startedAt)
-            return false;
-        if (event.ts > window.endsAt) {
-            this.suppressionWindows.delete(key);
-            return false;
-        }
-        if (event.role === 'user') {
-            this.suppressionWindows.delete(key);
-            return false;
-        }
-        return true;
-    }
-}
+import{randomUUID as g}from"node:crypto";import w from"node:fs";import{listClaudeTranscriptFiles as C,listCodexRolloutFiles as I,listOpenCodeSessionFiles as M,parseClaudeTranscriptChunk as A,parseCodexRolloutChunk as T,parseOpenCodeSessionFile as x}from"./parsers.js";import{probeCodexThreadActivity as _,interruptCodexThread as P}from"../agents/codex-control.js";import{loadNativeScannerState as v,saveNativeScannerState as D}from"./state.js";const h=6e4,m=h*2,N=30*6e4,S=20;function y(a){return a.replace(/\r\n/g,`
+`).trim()}function k(a){return a.split(/[\\/]+/).includes(".codex")}class R{client;timer=null;scanPromise=null;pendingClaims=new Map;suppressionWindows=new Map;constructor(e){this.client=e}start(){this.timer||(this.timer=setInterval(()=>{this.scanNow().catch(e=>{console.error("[native-fusion] periodic scan failed",e)})},h))}stop(){this.timer&&clearInterval(this.timer),this.timer=null}handleConnected(){this.start(),this.scanNow().catch(e=>{console.error("[native-fusion] initial scan failed",e)})}registerManagedSend(e){if(!e.canonicalMessageId)return;const s=e.sourceAgentType??e.agentType;s!=="codex"&&s!=="claude"&&s!=="opencode"||this.pendingClaims.set(e.sessionId,{sessionId:e.sessionId,agentType:e.agentType,sourceAgentType:s,canonicalMessageId:e.canonicalMessageId,text:y(e.text),createdAt:Date.now(),expiresAt:Date.now()+m,sourceSessionKey:e.sourceSessionKey??null})}noteManagedSourceSession(e,s,t){if(!t)return;const i=this.pendingClaims.get(e);i&&i.sourceAgentType===s&&(i.sourceSessionKey=t)}pruneState(){const e=Date.now();for(const[s,t]of this.pendingClaims.entries())t.expiresAt<=e&&this.pendingClaims.delete(s);for(const[s,t]of this.suppressionWindows.entries())t.endsAt<=e&&this.suppressionWindows.delete(s)}async scanNow(){if(this.client.getState()==="connected")return this.scanPromise?this.scanPromise:(this.scanPromise=this.runScan().finally(()=>{this.scanPromise=null}),this.scanPromise)}async getCodexThreadActivity(e){const s=await _({threadId:e.threadId,workDir:e.workDir});if(!s)return;if(!s.active||!s.runPhase)return null;const t=new Date().toISOString();return{sessionId:e.sessionId,runId:s.turnId??`codex:${e.threadId}`,runPhase:s.runPhase,startedAt:t,updatedAt:t,canStop:s.canStop}}async interruptCodexThread(e){return!!await P({threadId:e.threadId,workDir:e.workDir})}async runScan(){this.pruneState();const e=v(),s={...e.files},t=[],i=[...I(),...C(),...M()];for(const n of i){const o=w.statSync(n),r=e.files[n];if(!r){s[n]={offset:o.size,mtimeMs:o.mtimeMs};continue}const l=k(n),c=n.endsWith(".opencode-session.json"),d=c&&r?.mtimeMs!==o.mtimeMs?r.offset:r?.offset??0,f=c?x(n,d):l?T(n,d):A(n,d);s[n]={offset:f.nextOffset,mtimeMs:o.mtimeMs};for(const u of f.events){const p=this.tryClaimManagedEcho(u);if(p){t.push(p);continue}this.isSuppressed(u)||t.push(u)}}for(let n=0;n<t.length;n+=S){const o=t.slice(n,n+S);if(o.length===0)continue;const r=o.map(({repairHint:l,...c})=>c);await this.client.sendBufferedEvent({type:"event",event:"native.session.events",id:`native-fusion-${g()}`,payload:{events:r}},6e4)}e.files=s,D(e)}tryClaimManagedEcho(e){const s=Date.now();for(const[t,i]of this.pendingClaims.entries())if(i.sourceAgentType===e.agentType&&!(i.expiresAt<=s)&&e.role==="user"&&i.sourceSessionKey&&i.sourceSessionKey===e.sourceSessionKey&&!(Math.abs(e.ts-i.createdAt)>m)&&y(e.payload)===i.text)return this.pendingClaims.delete(t),this.suppressionWindows.set(`${e.agentType}:${e.sourceSessionKey}`,{sessionId:t,agentType:e.agentType,sourceSessionKey:e.sourceSessionKey,startedAt:e.ts,endsAt:Math.max(s,e.ts)+N}),{...e,sourceMode:"managed_echo_claim",claimCanonicalMessageId:i.canonicalMessageId};return null}isSuppressed(e){const s=`${e.agentType}:${e.sourceSessionKey}`,t=this.suppressionWindows.get(s);return!t||e.ts<t.startedAt?!1:e.ts>t.endsAt?(this.suppressionWindows.delete(s),!1):e.role==="user"?(this.suppressionWindows.delete(s),!1):!0}}export{R as NativeSessionFusionService};

package/dist/src/native-fusion/state.js

@@ -1,22 +1 @@
-// @arch docs/architecture/cli/native-session-fusion.md
-import fs from 'node:fs';
-import path from 'node:path';
-import { resolveShennianPath } from '../config/index.js';
-const STATE_FILE = resolveShennianPath('native-fusion-state.json');
-export function loadNativeScannerState() {
-    try {
-        const raw = fs.readFileSync(STATE_FILE, 'utf-8');
-        const parsed = JSON.parse(raw);
-        if (parsed && typeof parsed === 'object' && parsed.files && typeof parsed.files === 'object') {
-            return parsed;
-        }
-    }
-    catch {
-        // ignore missing or malformed state
-    }
-    return { files: {} };
-}
-export function saveNativeScannerState(state) {
-    fs.mkdirSync(path.dirname(STATE_FILE), { recursive: true });
-    fs.writeFileSync(STATE_FILE, JSON.stringify(state, null, 2));
-}
+import r from"node:fs";import i from"node:path";import{resolveShennianPath as o}from"../config/index.js";const n=o("native-fusion-state.json");function f(){try{const t=r.readFileSync(n,"utf-8"),e=JSON.parse(t);if(e&&typeof e=="object"&&e.files&&typeof e.files=="object")return e}catch{}return{files:{}}}function S(t){r.mkdirSync(i.dirname(n),{recursive:!0}),r.writeFileSync(n,JSON.stringify(t,null,2))}export{f as loadNativeScannerState,S as saveNativeScannerState};

package/dist/src/native-fusion/types.js

@@ -1 +1 @@
-export {};
+

package/dist/src/region.js

@@ -1,88 +1 @@
-// @arch docs/architecture/deployment.md
-// @test src/__tests__/config.test.ts
-import chalk from 'chalk';
-export const SERVERS = {
-    cn: { url: 'https://shennian.net', label: 'China  (shennian.net)' },
-    // Keep the historical key so old configs and protocol payloads remain
-    // compatible. Production is single-domain and resolves both keys to cn.
-    global: { url: 'https://shennian.net', label: 'China  (shennian.net)' },
-};
-const CN_TIMEZONES = [
-    'Asia/Shanghai', 'Asia/Chongqing', 'Asia/Chungking',
-    'Asia/Harbin', 'Asia/Urumqi', 'PRC',
-];
-function inferRegionByTimezone() {
-    try {
-        const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
-        if (CN_TIMEZONES.includes(tz))
-            return 'cn';
-    }
-    catch { /* Intl unavailable */ }
-    return 'cn';
-}
-async function detectRegionByIP(timeoutMs = 1500) {
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), timeoutMs);
-    try {
-        const res = await fetch(`${SERVERS.cn.url}/geo`, { signal: controller.signal });
-        const data = await res.json();
-        return data.country === 'CN' ? 'cn' : 'cn';
-    }
-    catch {
-        return null;
-    }
-    finally {
-        clearTimeout(timer);
-    }
-}
-async function verifyReachable(url, timeoutMs = 3000) {
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), timeoutMs);
-    try {
-        await fetch(`${url}/health`, { signal: controller.signal });
-        return true;
-    }
-    catch {
-        return false;
-    }
-    finally {
-        clearTimeout(timer);
-    }
-}
-/**
- * Detect the best server region and return its URL.
- *
- * Strategy: timezone as primary signal, IP geolocation as supplement.
- * - Chinese timezone → cn immediately (covers servers with UTC too via IP fallback).
- * - Non-Chinese timezone → try IP to detect if physically in China.
- */
-export async function detectAndChooseServer() {
-    console.log(chalk.gray('  Detecting best server...'));
-    const tzRegion = inferRegionByTimezone();
-    if (tzRegion === 'cn') {
-        const reachable = await verifyReachable(SERVERS.cn.url);
-        if (reachable) {
-            console.log(chalk.gray(`  Using ${SERVERS.cn.label} (timezone: China)`));
-            return SERVERS.cn.url;
-        }
-        console.error(chalk.red('  Error: cannot reach any server.'));
-        process.exit(1);
-    }
-    // Non-CN timezone: check IP to catch servers in China with UTC timezone
-    const ipRegion = await detectRegionByIP();
-    const region = ipRegion ?? tzRegion;
-    const reachable = await verifyReachable(SERVERS[region].url);
-    if (reachable) {
-        const source = ipRegion ? 'IP geolocation' : 'timezone';
-        console.log(chalk.gray(`  Using ${SERVERS[region].label} (${source})`));
-        return SERVERS[region].url;
-    }
-    console.error(chalk.red('  Error: cannot reach any server.'));
-    process.exit(1);
-}
-export function urlToRegion(url) {
-    return url.includes('shennian.net') ? 'cn' : 'global';
-}
-export function regionToUrl(region) {
-    return SERVERS[region].url;
-}
+import o from"chalk";const r={cn:{url:"https://shennian.net",label:"China  (shennian.net)"},global:{url:"https://shennian.net",label:"China  (shennian.net)"}},l=["Asia/Shanghai","Asia/Chongqing","Asia/Chungking","Asia/Harbin","Asia/Urumqi","PRC"];function s(){try{const n=Intl.DateTimeFormat().resolvedOptions().timeZone;if(l.includes(n))return"cn"}catch{}return"cn"}async function u(n=1500){const t=new AbortController,e=setTimeout(()=>t.abort(),n);try{return(await(await fetch(`${r.cn.url}/geo`,{signal:t.signal})).json()).country==="CN","cn"}catch{return null}finally{clearTimeout(e)}}async function i(n,t=3e3){const e=new AbortController,a=setTimeout(()=>e.abort(),t);try{return await fetch(`${n}/health`,{signal:e.signal}),!0}catch{return!1}finally{clearTimeout(a)}}async function g(){console.log(o.gray("  Detecting best server..."));const n=s();if(n==="cn"){if(await i(r.cn.url))return console.log(o.gray(`  Using ${r.cn.label} (timezone: China)`)),r.cn.url;console.error(o.red("  Error: cannot reach any server.")),process.exit(1)}const t=await u(),e=t??n;if(await i(r[e].url)){const c=t?"IP geolocation":"timezone";return console.log(o.gray(`  Using ${r[e].label} (${c})`)),r[e].url}console.error(o.red("  Error: cannot reach any server.")),process.exit(1)}function f(n){return n.includes("shennian.net")?"cn":"global"}function b(n){return r[n].url}export{r as SERVERS,g as detectAndChooseServer,b as regionToUrl,f as urlToRegion};