lark-remote 0.1.12 → 0.2.0

package/dist/session/pi/sessions.js

@@ -1,17 +1,27 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
-import { findJsonlLine, scanJsonlLines, readJsonlLinesFromOffset } from '../common/jsonl.js';
+import { findJsonlLine } from '../common/jsonl.js';
+import { scanJsonlOnce, tailOffsetAfter, scanTailEvents } from '../common/two-pass.js';
 import { extractContentBlocks } from '../common/content-blocks.js';
-import { UsageAccumulator } from '../common/usage-accumulator.js';
-import { STALE_MS } from '../common/constants.js';
-import { capEvents, paginate } from '../common/pagination.js';
+import { UsageAccumulator, contextWindowOccupancy, cumulativeUsageFields, } from '../common/usage-accumulator.js';
+import { isStale } from '../common/constants.js';
+import { encodeProjectDirName } from '../../platform/path.js';
+import { paginate } from '../common/pagination.js';
+import { sortByRecencyDesc } from '../common/recency.js';
+import { TtlCache } from '../../common/ttl-cache.js';
 function defaultPiDir() {
     return path.join(os.homedir(), '.pi', 'agent');
 }
-/** Encode cwd to pi's directory name format: '--<cwd-with-/->- + '-' --' */
+/**
+ * Encode cwd to pi's directory name format: '--<cwd with / \ : -> - --'
+ *
+ * 与 claude 共用 `encodeProjectDirName`（同一套 win32 归一规则），再去掉
+ * 前导分隔符产生的首个 `-`：`/Users/x` -> `Users-x`（不是 `-Users-x`）。
+ * win32 同理：`C:\Users\x` -> `C--Users-x`。
+ */
 function projectDirForCwd(cwd, sessionsDir) {
-    const encodedCwd = cwd.replace(/^\//, '').replace(/\//g, '-');
+    const encodedCwd = encodeProjectDirName(cwd).replace(/^-+/, '');
     const encoded = `--${encodedCwd}--`;
     return path.join(sessionsDir, encoded);
 }
@@ -19,10 +29,7 @@ function projectDirForCwd(cwd, sessionsDir) {
  * P1-19: TTL cache for pi directory scans (mirror codex getSessionIndex's
  * 5s TTL). Repeated /resume pages re-scan the whole sessions dir per call.
  */
-const PI_LIST_TTL_MS = 5000;
-/** Upper bound on cached listings; FIFO eviction past this. */
-const PI_LIST_MAX_ENTRIES = 32;
-const piListCache = new Map();
+const piListCache = new TtlCache(5_000, 32);
 /** Pi-specific field-name mapping for content block extraction. */
 export const PI_MAPPING = {
     toolUseType: 'toolCall',
@@ -144,14 +151,8 @@ function piScalarScan(filePath) {
     const acc = new UsageAccumulator();
     let tailOffset = -1;
     let lastUserText;
-    scanJsonlLines(filePath, (line, offset) => {
-        let obj;
-        try {
-            obj = JSON.parse(line);
-        }
-        catch {
-            return;
-        }
+    scanJsonlOnce(filePath, (rawObj, line, offset) => {
+        const obj = rawObj;
         if (obj.type === 'message') {
             const msg = obj.message;
             if (!msg)
@@ -169,9 +170,9 @@ function piScalarScan(filePath) {
             }
             // last user message offset + displayTitle. Record the byte offset
             // where the tail should start: the beginning of the NEXT line after
-            // this user message.
+            // this user message (see tailOffsetAfter).
             if (msg.role === 'user') {
-                tailOffset = offset + Buffer.byteLength(line, 'utf-8') + 1;
+                tailOffset = tailOffsetAfter(line, offset);
                 const text = extractPiText(msg.content);
                 // Compress skill-injection bodies so the "最近输入" label shows what
                 // the user invoked (skill:x) + any trailing real input, not a
@@ -207,62 +208,48 @@ function buildPiUsage(acc) {
         return undefined;
     }
     const l = acc.last;
-    const contextLength = l.input + l.cacheRead + l.cacheCreation;
     return {
         inputTokens: l.input,
         outputTokens: l.output,
-        contextLength,
+        contextLength: contextWindowOccupancy(l),
         compactCount: acc.compactCount > 0 ? acc.compactCount : undefined,
         cacheReadTokens: l.cacheRead > 0 ? l.cacheRead : 0,
         cacheCreationTokens: l.cacheCreation > 0 ? l.cacheCreation : 0,
         totalTokens: l.total > 0 ? l.total : undefined,
         // Cumulative (session-wide): sum of ALL runs in the jsonl file.
-        cumulativeTotalTokens: t.input + t.output + t.cacheRead + t.cacheCreation,
-        cumulativeInputTokens: t.input,
-        cumulativeOutputTokens: t.output,
-        cumulativeCacheReadTokens: t.cacheRead,
-        cumulativeCacheCreationTokens: t.cacheCreation,
+        ...cumulativeUsageFields(t),
     };
 }
 /**
- * P2-6 + P2-5 second-pass: extract content-block events from the tail
- * (lines after the last user message), re-parsing only those lines.
- * `tailLines` is already the tail-only slice (read via
- * `readJsonlLinesFromOffset`), so both raw line-string memory and parsed-
- * object memory are O(tail), not O(whole file) — P2-6 + P2-5.
+ * P2-6 + P2-5 second-pass tail mapper: expand one parsed tail line into
+ * content-block events. Re-parses only tail lines (scanTailEvents does the
+ * offset re-read + line filtering), so both raw line-string memory and
+ * parsed-object memory are O(tail), not O(whole file) — P2-6 + P2-5.
+ * `maxEvents` capping is applied by scanTailEvents.
  */
-function extractPiEventsFromTail(tailLines) {
+function mapPiTailLine(rawObj) {
     const events = [];
-    for (const line of tailLines) {
-        if (!line.trim())
-            continue;
-        try {
-            const obj = JSON.parse(line);
-            if (obj.type !== 'message' || !obj.message)
-                continue;
-            const message = obj.message;
-            // Handle error messages: when stopReason is "error", content is empty
-            // but errorMessage has details
-            if (message.stopReason === 'error' && message.errorMessage) {
-                events.push({
-                    type: 'error',
-                    content: `❌ ${message.errorMessage}`,
-                    timestamp: obj.timestamp,
-                });
-                continue;
-            }
-            const blocks = extractContentBlocks(message.content, PI_MAPPING);
-            const role = message.role ?? 'unknown';
-            for (const block of blocks) {
-                events.push({ type: block.type, content: block.content, timestamp: obj.timestamp });
-            }
-            if (blocks.length === 0 && message.role) {
-                events.push({ type: role, content: `(${role} event)`, timestamp: obj.timestamp });
-            }
-        }
-        catch {
-            /* skip */
-        }
+    const obj = rawObj;
+    if (obj.type !== 'message' || !obj.message)
+        return events;
+    const message = obj.message;
+    // Handle error messages: when stopReason is "error", content is empty
+    // but errorMessage has details
+    if (message.stopReason === 'error' && message.errorMessage) {
+        events.push({
+            type: 'error',
+            content: `❌ ${message.errorMessage}`,
+            timestamp: obj.timestamp,
+        });
+        return events;
+    }
+    const blocks = extractContentBlocks(message.content, PI_MAPPING);
+    const role = message.role ?? 'unknown';
+    for (const block of blocks) {
+        events.push({ type: block.type, content: block.content, timestamp: obj.timestamp });
+    }
+    if (blocks.length === 0 && message.role) {
+        events.push({ type: role, content: `(${role} event)`, timestamp: obj.timestamp });
     }
     return events;
 }
@@ -303,29 +290,17 @@ export class PiSessionReader {
         if (fileCwd && fileCwd !== cwd) {
             return { events: [] };
         }
-        // P2-5 + P2-6: First pass STREAMS the file once via `scanJsonlLines`
-        // (no `string[]` materialized), parsing each line once to collect
-        // scalars (usage, tailOffset, displayTitle) while retaining no parsed
-        // objects and no whole-file line array. The tailOffset is the byte
-        // offset where the tail begins (start of the line after the last user
-        // message). A second pass re-reads ONLY the tail from that offset via
-        // `readJsonlLinesFromOffset` and re-parses it for events — O(tail)
-        // memory for both raw line strings and parsed objects, instead of
-        // O(whole file).
-        //
-        // Parse ratio: ≈1.0–1.5× line count when a user message exists.
-        // When the session has NO user message, tailOffset stays -1 and the
-        // tail IS the whole file → scan(N) + tail(N) = 2.0× — the known
-        // asymptotic upper bound of the two-phase design.
+        // P2-5 + P2-6: Two-pass scan (see `scanJsonlOnce` / `scanTailEvents` in
+        // session/common/two-pass.ts): pass 1 streams the file once collecting
+        // scalars (usage, tailOffset, displayTitle) with O(1) parsed-object
+        // retention; pass 2 re-reads ONLY the tail and re-parses it for events,
+        // capped at maxEvents (keeps the LAST N events, matching
+        // CodexSessionReader's slice(-maxEvents), so auto-resume cards don't
+        // load the entire session).
         const scan = piScalarScan(filePath);
-        const tailLines = readJsonlLinesFromOffset(filePath, scan.tailOffset >= 0 ? scan.tailOffset : 0);
-        const events = extractPiEventsFromTail(tailLines);
-        // Apply maxEvents cap: keep the LAST N events (most recent), matching
-        // CodexSessionReader's slice(-maxEvents). maxEvents limits the catch-up
-        // tail so auto-resume cards don't load the entire session.
-        const cappedEvents = capEvents(events, opts?.maxEvents);
+        const events = scanTailEvents(filePath, scan.tailOffset, mapPiTailLine, opts?.maxEvents);
         return {
-            events: cappedEvents,
+            events,
             usage: scan.usage,
             displayTitle: scan.displayTitle,
         };
@@ -336,7 +311,7 @@ export class PiSessionReader {
             return false;
         try {
             const st = fs.statSync(filePath);
-            return Date.now() - st.mtimeMs < STALE_MS;
+            return !isStale(st.mtimeMs);
         }
         catch {
             return false;
@@ -346,8 +321,8 @@ export class PiSessionReader {
     listSessionsByScan(cwd) {
         const cacheKey = `${this.sessionsDir}\u0000${cwd}`;
         const cached = piListCache.get(cacheKey);
-        if (cached && Date.now() - cached.builtAt < PI_LIST_TTL_MS) {
-            return cached.sessions;
+        if (cached) {
+            return cached;
         }
         const dir = projectDirForCwd(cwd, this.sessionsDir);
         let files;
@@ -381,14 +356,8 @@ export class PiSessionReader {
             }
         }
         // Same-mtime ties: secondary key keeps the full order deterministic.
-        sessions.sort((a, b) => b.mtime - a.mtime || a.sessionId.localeCompare(b.sessionId));
-        piListCache.set(cacheKey, { builtAt: Date.now(), sessions });
-        // Bound the cache (map iteration order = insertion order).
-        if (piListCache.size > PI_LIST_MAX_ENTRIES) {
-            const oldest = piListCache.keys().next().value;
-            if (oldest !== undefined)
-                piListCache.delete(oldest);
-        }
+        sortByRecencyDesc(sessions, (s) => s.mtime, (s) => s.sessionId);
+        piListCache.set(cacheKey, sessions);
         return sessions;
     }
 }

package/dist/update/index.d.ts

@@ -5,6 +5,5 @@
  * package installation (detect package manager + global install),
  * and the combined workflow for the /update command and --update CLI flag.
  */
-export { isNewer, checkLatestVersion, type VersionCheckResult, type UpdateCache, } from './version-check.js';
-export { runInstallLatest, type PackageManager, type InstallResult } from './install.js';
-export { formatUpdateHint } from './startup-hint.js';
+export { isNewer, checkLatestVersion, formatUpdateHint, type VersionCheckResult, } from './version-check.js';
+export { runInstallLatest, type InstallResult } from './install.js';

package/dist/update/index.js

@@ -5,7 +5,6 @@
  * package installation (detect package manager + global install),
  * and the combined workflow for the /update command and --update CLI flag.
  */
-export { isNewer, checkLatestVersion, } from './version-check.js';
+export { isNewer, checkLatestVersion, formatUpdateHint, } from './version-check.js';
 export { runInstallLatest } from './install.js';
-export { formatUpdateHint } from './startup-hint.js';
 //# sourceMappingURL=index.js.map

package/dist/update/install.d.ts

@@ -38,7 +38,8 @@ export declare function detectPackageManager(scriptPath?: string): PackageManage
  * Run the global install command to upgrade lark-remote to the latest version.
  *
  * @param opts.packageManager - Override detected package manager
- * @param opts.execFn - Override execFile for testing
+ * @param opts.execFn - Override exec for testing; default routes through
+ *   platform/spawn.ts (cross-spawn, win32 .cmd shim safe)
  */
 export declare function runInstallLatest(opts?: {
     packageManager?: PackageManager | null;

package/dist/update/install.js

@@ -1,6 +1,53 @@
-import { execFile, execFileSync } from 'node:child_process';
 import fs from 'node:fs';
 import { getLogger } from '../logger/index.js';
+import { resolveExecutable } from '../platform/command.js';
+import { currentPlatform, isWin32 } from '../platform/select.js';
+import { spawnProcess, spawnProcessSync } from '../platform/spawn.js';
+/**
+ * execFile 回调风格适配 cross-spawn（platform/spawn.ts）。
+ *
+ * npm/pnpm 在 Windows 是 .cmd 垫片，execFile 不经 shell 无法执行——Node 自
+ * CVE-2024-27980 收紧后对无 shell 启动 .cmd 直接抛错，win32 上 /update 会
+ * 永远失败。执行统一走 spawnProcess（cross-spawn 处理 PATHEXT + .cmd 经
+ * cmd.exe 受控执行），错误/退出码语义对齐 execFile：
+ * - 非 0 退出 → err.message 为 execFile 同款 "Command failed: ..." 形态
+ *   （含 stderr 首段，EACCES 提示逻辑依赖它）；
+ * - 'error' 事件（ENOENT 等）→ 原样回调。
+ */
+function execViaSpawnProcess(file, args, options, callback) {
+    const proc = spawnProcess(file, args, {
+        timeout: options.timeout,
+        stdio: ['ignore', 'pipe', 'pipe'],
+        windowsHide: true,
+    });
+    let stdout = '';
+    let stderr = '';
+    let settled = false;
+    const finish = (error) => {
+        if (settled)
+            return;
+        settled = true;
+        callback(error, stdout, stderr);
+    };
+    proc.stdout?.setEncoding('utf8');
+    proc.stdout?.on('data', (chunk) => {
+        stdout += chunk;
+    });
+    proc.stderr?.setEncoding('utf8');
+    proc.stderr?.on('data', (chunk) => {
+        stderr += chunk;
+    });
+    proc.on('error', (err) => finish(err));
+    proc.on('close', (code, signal) => {
+        if (code === 0) {
+            finish(null);
+            return;
+        }
+        const detail = stderr.trim() || stdout.trim();
+        const how = signal ? ` terminated with ${signal}` : ` with exit code ${code ?? 'unknown'}`;
+        finish(new Error(`Command failed: ${file} ${args.join(' ')}${how}${detail ? `\n${detail}` : ''}`));
+    });
+}
 /**
  * Infer the installing package manager from the real path of the running
  * script (e.g. `.../node_modules/lark-remote/dist/index.js`).
@@ -54,15 +101,16 @@ export function detectPackageManager(scriptPath) {
         if (inferred)
             return inferred;
     }
-    // 3. which availability fallback
+    // 3. availability fallback: 纯 Node PATH 解析（win32 PATHEXT），不再依赖外部 which
+    //    （Windows 无 which）；win32 再用 where.exe 兜底罕见的解析失败场景（v2 §4.3）
     const candidates = ['npm', 'bun', 'pnpm'];
     for (const cmd of candidates) {
-        try {
-            execFileSync('which', [cmd], { stdio: 'pipe', timeout: 3000 });
+        if (resolveExecutable(cmd))
             return cmd;
-        }
-        catch {
-            // Not found, try next
+        if (isWin32(currentPlatform)) {
+            const res = spawnProcessSync('where.exe', [cmd], { stdio: 'pipe', timeout: 3000 });
+            if (!res.error && res.status === 0)
+                return cmd;
         }
     }
     return null;
@@ -82,7 +130,8 @@ function getInstallCommand(pm) {
  * Run the global install command to upgrade lark-remote to the latest version.
  *
  * @param opts.packageManager - Override detected package manager
- * @param opts.execFn - Override execFile for testing
+ * @param opts.execFn - Override exec for testing; default routes through
+ *   platform/spawn.ts (cross-spawn, win32 .cmd shim safe)
  */
 export function runInstallLatest(opts) {
     // If packageManager is explicitly null, skip detection and fail immediately.
@@ -104,7 +153,7 @@ export function runInstallLatest(opts) {
         });
     }
     const { cmd, args } = getInstallCommand(pm);
-    const execFn = opts?.execFn ?? ((...args) => execFile(...args));
+    const execFn = opts?.execFn ?? execViaSpawnProcess;
     const logger = getLogger();
     logger.info(`[update] running: ${cmd} ${args.join(' ')}`);
     return new Promise((resolve) => {

package/dist/update/version-check.d.ts

@@ -29,3 +29,8 @@ export declare function checkLatestVersion(opts?: {
     bypassCache?: boolean;
     registryUrl?: string;
 }): Promise<VersionCheckResult>;
+/**
+ * Format an update hint string for the startup notification.
+ * Returns null if no newer version is available.
+ */
+export declare function formatUpdateHint(current: string, latest: string): string | null;

package/dist/update/version-check.js

@@ -146,4 +146,13 @@ export async function checkLatestVersion(opts) {
     }
     return { current, latest };
 }
+/**
+ * Format an update hint string for the startup notification.
+ * Returns null if no newer version is available.
+ */
+export function formatUpdateHint(current, latest) {
+    if (!isNewer(current, latest))
+        return null;
+    return `📦 有新版本 ${latest} 可用（当前 ${current}），发送 /update 升级`;
+}
 //# sourceMappingURL=version-check.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lark-remote",
-  "version": "0.1.12",
+  "version": "0.2.0",
   "description": "Feishu (Lark) private-chat bridge to local coding agents — Claude Code / Codex / opencode / pi / kimi, with live-streaming CardKit 2.0 cards",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,8 +25,9 @@
   ],
   "scripts": {
     "dev": "bun src/index.ts",
-    "build": "rm -rf dist && tsc && chmod +x dist/index.js dist/cli.js",
-    "typecheck": "tsc --noEmit",
+    "build": "node -e \"require('fs').rmSync('dist',{recursive:true,force:true})\" && tsc && node -e \"if(process.platform!=='win32'){const fs=require('fs');for(const f of ['dist/index.js','dist/cli.js'])fs.chmodSync(f,0o755)}\"",
+    "typecheck": "tsc --noEmit && tsc -p tsconfig.test-infra.json",
+    "typecheck:test-infra": "tsc -p tsconfig.test-infra.json",
     "lint": "eslint src tests",
     "lint:fix": "eslint src tests --fix",
     "format": "prettier --write 'src/**/*.ts' 'tests/**/*.ts'",
@@ -42,6 +43,7 @@
     "test:config": "vitest run --project infra-config",
     "test:order": "vitest run --project infra-order",
     "test:misc": "vitest run --project infra-misc",
+    "test:platform": "vitest run --project infra-platform",
     "test:claude": "vitest run --project agent-claude",
     "test:codex": "vitest run --project agent-codex",
     "test:opencode": "vitest run --project agent-opencode",
@@ -57,7 +59,7 @@
     "test:pi-full": "vitest run --project agent-pi --project infra-runner --project infra-session",
     "test:kimi-full": "vitest run --project agent-kimi --project infra-runner --project infra-session",
     "test:live": "vitest run --project live",
-    "prepublishOnly": "tsc --noEmit && vitest run && rm -rf dist && tsc && chmod +x dist/index.js dist/cli.js",
+    "prepublishOnly": "npm run typecheck && vitest run && npm run build",
     "prepack": "node -e \"const fs=require('fs');if(!fs.existsSync('dist/cli.js')){console.error('dist/ missing — run bun run build first');process.exit(1)}\""
   },
   "publishConfig": {
@@ -94,16 +96,16 @@
     "@iarna/toml": "^2.2.5",
     "@larksuite/channel": "^0.3.0",
     "axios": "^1.18.0",
+    "cross-spawn": "^7.0.6",
     "form-data": "^4.0.6",
-    "qrcode-terminal": "^0.12.0",
+    "qrcode-generator": "^2.0.4",
     "yaml": "^2.9.0",
     "zod": "^4.4.3"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "@types/form-data": "^2.5.2",
+    "@types/cross-spawn": "^6.0.6",
     "@types/node": "^26.1.2",
-    "@types/qrcode-terminal": "^0.12.2",
     "@vitest/coverage-v8": "4.1.10",
     "eslint": "^10.7.0",
     "eslint-config-prettier": "^10.1.8",

package/dist/update/startup-hint.d.ts

@@ -1,5 +0,0 @@
-/**
- * Format an update hint string for the startup notification.
- * Returns null if no newer version is available.
- */
-export declare function formatUpdateHint(current: string, latest: string): string | null;

package/dist/update/startup-hint.js

@@ -1,11 +0,0 @@
-import { isNewer } from './version-check.js';
-/**
- * Format an update hint string for the startup notification.
- * Returns null if no newer version is available.
- */
-export function formatUpdateHint(current, latest) {
-    if (!isNewer(current, latest))
-        return null;
-    return `📦 有新版本 ${latest} 可用（当前 ${current}），发送 /update 升级`;
-}
-//# sourceMappingURL=startup-hint.js.map