lark-remote 0.1.8 → 0.1.10

package/dist/runner/types.d.ts

@@ -69,6 +69,23 @@ export type ApprovalAction = {
 /** Claude：允许当前请求 + 本会话后续所有权限请求自动放行（允许所有）。 */
  | {
     action: 'accept_all';
+}
+/**
+ * 计划审批「拒绝并附修改意见」：deny + message，Claude 留在 plan 模式
+ * 按意见修订（等价 TUI「Tell Claude what to change」）。
+ */
+ | {
+    action: 'decline_with_feedback';
+    message: string;
+}
+/**
+ * 计划审批「批准并采纳修改意见」：allow + updatedInput.plan（原计划追加
+ * 意见），触发 Claude 侧 planWasEdited → tool_result 回显
+ * "## Approved Plan (edited by user)"（等价 TUI shift+tab approve with feedback）。
+ */
+ | {
+    action: 'accept_with_feedback';
+    plan: string;
 } | {
     action: 'decline';
 } | {
@@ -145,6 +162,20 @@ export interface ApprovalView {
      * 表达审批内容，避免落入 command 槽位显示无意义 `{}`。
      */
     toolName?: string;
+    /**
+     * 计划全文（kind === 'tool' 且 toolName === 'ExitPlanMode' 时存在）。
+     * 来源：control_request input.plan（CLI normalizeToolInput 从磁盘注入，
+     * 非稳定）→ 计划文件读取（input.planFilePath / 会话内 Write/Edit 跟踪）。
+     */
+    plan?: string;
+    /** 计划文件路径（ExitPlanMode；input.planFilePath 或会话内跟踪所得）。 */
+    planFilePath?: string;
+    /**
+     * 用户已填写的计划修改意见（ExitPlanMode 反馈输入框；coordinator
+     * planFeedback 回流，卡片回显）。供「拒绝并附意见」/「批准并采纳修改」
+     * 两个决策复用。
+     */
+    planFeedback?: string;
     /** 原始 input 的 JSON 字符串（kind === 'tool' 且 input 非空时展示）。 */
     toolInput?: string;
     fileChanges?: Array<{
@@ -306,7 +337,7 @@ export interface SpawnOptions {
     settings?: string;
 }
 /**
- * Seam (§3): the contract any agent runner (claude/codex/opencode/pi/kimi)
+ * Seam (§3): the contract any agent runner (claude/codex/opencode/pi/kimi/dsh)
  * must satisfy for the router/bridge.
  * Declared here so callers depend on the interface, not the concrete
  * runner classes — test stubs satisfy this structurally.
@@ -443,7 +474,7 @@ export interface AgentRunner extends Runner {
 }
 /** Agent self-describing status info for /status display. */
 export interface AgentStatusInfo {
-    /** Agent kind (claude/codex/opencode/pi/kimi). */
+    /** Agent kind (claude/codex/opencode/pi/kimi/dsh). */
     kind: AgentKind;
     /** Display model name. */
     model: string;

package/dist/session/common/pagination.d.ts

@@ -1,7 +1,7 @@
 /**
  * Shared pagination / truncation helpers for agent session readers.
  *
- * The five readers (claude/codex/opencode/pi/kimi) all implement the same
+ * The six readers (claude/codex/opencode/pi/kimi/dsh) all implement the same
  * offset-clamp + slice + total pattern for `listSessions`, and the same
  * maxEvents tail-cap for `readSessionContent`. These were duplicated (and had
  * drifted on the default limit). Centralized here so the contract is defined

package/dist/session/common/pagination.js

@@ -1,7 +1,7 @@
 /**
  * Shared pagination / truncation helpers for agent session readers.
  *
- * The five readers (claude/codex/opencode/pi/kimi) all implement the same
+ * The six readers (claude/codex/opencode/pi/kimi/dsh) all implement the same
  * offset-clamp + slice + total pattern for `listSessions`, and the same
  * maxEvents tail-cap for `readSessionContent`. These were duplicated (and had
  * drifted on the default limit). Centralized here so the contract is defined

package/dist/session/dsh/sessions.d.ts

@@ -15,13 +15,18 @@
 import type { AgentSession, AgentSessionReader, SessionContent } from '../../runner/index.js';
 interface DshSessionReaderOptions {
     host?: string;
+    /** 每次调用时解析当前 host（/config 修改 host 后 runner 重建、reader 也跟随新 host）。
+     *  优先于固定的 `host`。 */
+    hostProvider?: () => string | undefined;
     /** Injectable synchronous unary transport. Defaults to spawnSync curl. */
     syncRequest?: (baseUrl: string, method: string, payload: unknown) => unknown;
 }
 export declare class DshSessionReader implements AgentSessionReader {
-    private readonly baseUrl;
+    private readonly hostProvider;
     private readonly syncRequest;
     constructor(opts?: DshSessionReaderOptions);
+    /** 解析当前 host（hostProvider 优先，允许 /config 热改 host）。 */
+    private resolveBaseUrl;
     private unary;
     listSessions(cwd: string, opts?: {
         limit?: number;

package/dist/session/dsh/sessions.js

@@ -17,6 +17,13 @@ import { getLogger } from '../../logger/index.js';
 import { DEFAULT_DSH_HOST } from '../../config/index.js';
 import { capEvents, paginate } from '../common/pagination.js';
 import { truncateUtf8, TOOL_RESULT_MAX_BYTES } from '../../common/truncate.js';
+/**
+ * CC-05: history 拉取上限。DSH session.history 的 maxMessages 同时限制返回条数，
+ * 若用它同时充当展示截断，>50 事件的会话累计 usage 会少算。这里拉取一个足够大的
+ * 上限保证 usage 累加覆盖整个会话；展示仍由 capEvents(opts?.maxEvents ?? 50) 截断。
+ * （若 DSH 支持分页 cursor 可改成分页，当前用有界大拉取，见 review-fix-plan-cc.md）
+ */
+const DSH_HISTORY_FETCH_LIMIT = 10_000;
 /** Synchronous unary POST via curl (the reader interface is synchronous). */
 function defaultSyncRequest(baseUrl, method, payload) {
     const body = JSON.stringify({
@@ -53,14 +60,20 @@ function defaultSyncRequest(baseUrl, method, payload) {
     return parsed.result.value;
 }
 export class DshSessionReader {
-    baseUrl;
+    hostProvider;
     syncRequest;
     constructor(opts = {}) {
-        this.baseUrl = (opts.host ?? DEFAULT_DSH_HOST).replace(/\/$/, '');
+        const fixed = (opts.host ?? DEFAULT_DSH_HOST).replace(/\/$/, '');
+        this.hostProvider = opts.hostProvider ?? (() => fixed);
         this.syncRequest = opts.syncRequest ?? defaultSyncRequest;
     }
+    /** 解析当前 host（hostProvider 优先，允许 /config 热改 host）。 */
+    resolveBaseUrl() {
+        const host = this.hostProvider();
+        return (host && host.length > 0 ? host : DEFAULT_DSH_HOST).replace(/\/$/, '');
+    }
     unary(method, payload) {
-        return this.syncRequest(this.baseUrl, method, payload);
+        return this.syncRequest(this.resolveBaseUrl(), method, payload);
     }
     listSessions(cwd, opts) {
         try {
@@ -90,7 +103,7 @@ export class DshSessionReader {
         try {
             const value = this.unary('session.history', {
                 sessionId,
-                maxMessages: opts?.maxEvents ?? 50,
+                maxMessages: DSH_HISTORY_FETCH_LIMIT,
             });
             const events = [];
             let displayTitle;
@@ -142,7 +155,9 @@ export class DshSessionReader {
                 };
             }
             return {
-                events: capEvents(events, opts?.maxEvents),
+                // CC-05: 展示仍按 maxEvents 尾截断（默认 50，保持原行为），usage 已在上面基于
+                // 完整 history 累加。
+                events: capEvents(events, opts?.maxEvents ?? 50),
                 ...(sessionUsage ? { usage: sessionUsage } : {}),
                 ...(displayTitle ? { displayTitle } : {}),
             };

package/dist/workspace/index.d.ts

@@ -14,6 +14,8 @@ export interface WorkspaceEntry {
  * lastUsedAt 语义（2026-08-19 语义对齐）：保存（save）与使用（use/touch）
  * 都会把时间戳更新为当前时间。save 内部调用 touch，保证「最近使用」排序
  * 对新保存的 workspace 同样生效（新条目应排在列表最前，而非沉底）。
+ * 同一毫秒内连续操作时 touch 会用 max+1 保证严格递增，避免 Date.now 相同
+ * 导致最近排序退化为字母序。
  *
  * Data migration: old format `{ alias: "path" }` is normalized to
  * `{ alias: { path, lastUsedAt: 0 } }` on first load and persisted.
@@ -31,6 +33,12 @@ export declare class WorkspaceStore {
     /**
      * Update lastUsedAt to now for the given alias and persist.
      * No-op if the alias does not exist.
+     *
+     * To keep "recent" ordering stable even for rapid successive saves/uses in
+     * the same millisecond, never allow another entry to share the same
+     * timestamp while this entry is being touched. If a peer already has a
+     * timestamp at or after the current wall-clock time, use max+1 so the
+     * touched entry always becomes the most recently used.
      */
     touch(name: string): void;
     /**

package/dist/workspace/index.js

@@ -13,6 +13,8 @@ import { getLogger } from '../logger/index.js';
  * lastUsedAt 语义（2026-08-19 语义对齐）：保存（save）与使用（use/touch）
  * 都会把时间戳更新为当前时间。save 内部调用 touch，保证「最近使用」排序
  * 对新保存的 workspace 同样生效（新条目应排在列表最前，而非沉底）。
+ * 同一毫秒内连续操作时 touch 会用 max+1 保证严格递增，避免 Date.now 相同
+ * 导致最近排序退化为字母序。
  *
  * Data migration: old format `{ alias: "path" }` is normalized to
  * `{ alias: { path, lastUsedAt: 0 } }` on first load and persisted.
@@ -83,12 +85,29 @@ export class WorkspaceStore {
     /**
      * Update lastUsedAt to now for the given alias and persist.
      * No-op if the alias does not exist.
+     *
+     * To keep "recent" ordering stable even for rapid successive saves/uses in
+     * the same millisecond, never allow another entry to share the same
+     * timestamp while this entry is being touched. If a peer already has a
+     * timestamp at or after the current wall-clock time, use max+1 so the
+     * touched entry always becomes the most recently used.
      */
     touch(name) {
         const entry = this.data.get(name);
         if (!entry)
             return;
-        entry.lastUsedAt = Date.now();
+        const now = Date.now();
+        let max = Math.max(now, entry.lastUsedAt);
+        let hasPeerAtOrAfterNow = false;
+        for (const [otherName, other] of this.data) {
+            if (otherName === name)
+                continue;
+            if (other.lastUsedAt > max)
+                max = other.lastUsedAt;
+            if (other.lastUsedAt >= now)
+                hasPeerAtOrAfterNow = true;
+        }
+        entry.lastUsedAt = hasPeerAtOrAfterNow ? max + 1 : max;
         this.persist();
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lark-remote",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "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",

package/dist/order/alias-store.d.ts

@@ -1,38 +0,0 @@
-export declare const MAX_ALIASES = 50;
-export declare const MAX_ALIAS_NAME_LENGTH = 20;
-export declare const MAX_ALIAS_TEXT_LENGTH = 200;
-/**
- * 别名名称规则：`[A-Za-z_][A-Za-z0-9_]*`，≤20 字符，不能数字开头
- * —— `$500`、`$3d` 这类正常文本永远不匹配，不会误展开。
- */
-export declare const ALIAS_NAME_PATTERN: RegExp;
-export interface AliasEntry {
-    name: string;
-    text: string;
-    createdAt: string;
-}
-/**
- * 全局别名存储。
- *
- * 独立于 OrderStore（aliases.json），避免破坏 orders.json 向后兼容。
- * 原子写（tmp + rename）+ 损坏恢复，复用 OrderStore/WorkspaceStore 同一模式。
- */
-export declare class AliasStore {
-    private filePath;
-    private data;
-    constructor(filePath?: string);
-    /** Reload data from disk (useful when another process may have written). */
-    reload(): void;
-    private load;
-    private persist;
-    has(name: string): boolean;
-    get(name: string): AliasEntry | undefined;
-    list(): AliasEntry[];
-    /**
-     * 注册/更新别名（同名覆盖文本，保留 createdAt）。返回写入后的条目。
-     * 名称/文本/数量超限时抛错，由调用方提示用户。
-     */
-    set(name: string, text: string): AliasEntry;
-    /** 删除别名；不存在返回 false。 */
-    remove(name: string): boolean;
-}

package/dist/order/alias-store.js

@@ -1,106 +0,0 @@
-import path from 'node:path';
-import os from 'node:os';
-import { atomicWriteJson } from '../persistence/atomic-write.js';
-import { loadJsonFile } from '../persistence/load-json-file.js';
-export const MAX_ALIASES = 50;
-export const MAX_ALIAS_NAME_LENGTH = 20;
-export const MAX_ALIAS_TEXT_LENGTH = 200;
-/**
- * 别名名称规则：`[A-Za-z_][A-Za-z0-9_]*`，≤20 字符，不能数字开头
- * —— `$500`、`$3d` 这类正常文本永远不匹配，不会误展开。
- */
-export const ALIAS_NAME_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
-/**
- * 全局别名存储。
- *
- * 独立于 OrderStore（aliases.json），避免破坏 orders.json 向后兼容。
- * 原子写（tmp + rename）+ 损坏恢复，复用 OrderStore/WorkspaceStore 同一模式。
- */
-export class AliasStore {
-    filePath;
-    data;
-    constructor(filePath) {
-        this.filePath = filePath ?? path.join(os.homedir(), '.lark-remote', 'aliases.json');
-        this.data = [];
-        this.load();
-    }
-    /** Reload data from disk (useful when another process may have written). */
-    reload() {
-        this.load();
-    }
-    load() {
-        const parsed = loadJsonFile(this.filePath, undefined);
-        if (!parsed || !Array.isArray(parsed)) {
-            this.data = [];
-            return;
-        }
-        const valid = [];
-        for (const e of parsed) {
-            if (e &&
-                typeof e.name === 'string' &&
-                typeof e.text === 'string' &&
-                typeof e.createdAt === 'string' &&
-                ALIAS_NAME_PATTERN.test(e.name) &&
-                e.name.length <= MAX_ALIAS_NAME_LENGTH) {
-                valid.push({
-                    name: e.name,
-                    text: e.text.slice(0, MAX_ALIAS_TEXT_LENGTH),
-                    createdAt: e.createdAt,
-                });
-            }
-        }
-        this.data = valid;
-    }
-    persist() {
-        atomicWriteJson(this.filePath, this.data);
-    }
-    has(name) {
-        return this.data.some((a) => a.name === name);
-    }
-    get(name) {
-        return this.data.find((a) => a.name === name);
-    }
-    list() {
-        return [...this.data];
-    }
-    /**
-     * 注册/更新别名（同名覆盖文本，保留 createdAt）。返回写入后的条目。
-     * 名称/文本/数量超限时抛错，由调用方提示用户。
-     */
-    set(name, text) {
-        if (!ALIAS_NAME_PATTERN.test(name) || name.length > MAX_ALIAS_NAME_LENGTH) {
-            throw new Error(`别名名称只能包含字母/数字/下划线，不能数字开头，且不超过 ${MAX_ALIAS_NAME_LENGTH} 字符`);
-        }
-        if (text.length > MAX_ALIAS_TEXT_LENGTH) {
-            throw new Error(`别名文本超过 ${MAX_ALIAS_TEXT_LENGTH} 字符限制`);
-        }
-        if (!this.has(name) && this.data.length >= MAX_ALIASES) {
-            throw new Error(`别名数量已达上限 ${MAX_ALIASES}`);
-        }
-        const existing = this.get(name);
-        const entry = {
-            name,
-            text,
-            createdAt: existing?.createdAt ?? new Date().toISOString(),
-        };
-        const idx = this.data.findIndex((a) => a.name === name);
-        if (idx >= 0) {
-            this.data[idx] = entry;
-        }
-        else {
-            this.data.push(entry);
-        }
-        this.persist();
-        return entry;
-    }
-    /** 删除别名；不存在返回 false。 */
-    remove(name) {
-        const before = this.data.length;
-        this.data = this.data.filter((a) => a.name !== name);
-        if (this.data.length === before)
-            return false;
-        this.persist();
-        return true;
-    }
-}
-//# sourceMappingURL=alias-store.js.map