@orion-agents/orion-code 0.3.24 → 0.3.25

package/CHANGELOG.md

@@ -22,11 +22,42 @@ which is **not** a pass.
 
 ## [Unreleased]
 
-## [0.3.24]
+## [0.3.25] — UNRELEASED
 
-> **Status: candidate.** Implementation on `codex/v0.3.24`, based on `main@6ed47fd`.
-> Plan: `docs/plan/v0.3.24-plan.md`. Registry and release status must be
-> verified from their own immutable receipts, not inferred from this changelog.
+> **Status: candidate.** Open. Four open-issue fixes: the Git conflict view reads the
+> edited working file from the filesystem instead of an unstored object (#269), file
+> history walks the requested revision instead of always HEAD (#270), model switching
+> gates the compact preflight on effective input budgets instead of raw context windows
+> (#271), and the left project navigation keeps a stable registration order when
+> sessions are activated (#272). Plan: `docs/plan/v0.3.25-plan.md`. Not merged, tagged
+> or published.
+
+### Fixed
+
+- #269: `GET /git/conflict` no longer fails with `git cat-file: could not get object
+  info` after editing a conflicted file before staging — the `worktree` version is read
+  from the filesystem (contained within the repository root) instead of an object
+  `hash-object` never wrote.
+- #270: `GET /git/file-history` with a `rev` now walks that revision; previously the
+  validated revision never reached the `git log` command and every query walked HEAD.
+- #271: switching to a model with the same or larger raw context window but a smaller
+  effective input budget (larger output reserve) now reports `compactRequired` and runs
+  the compact preflight instead of silently persisting a model the history cannot fit.
+
+### Changed
+
+- #272: the left project navigation keeps a stable registration order for unpinned
+  projects (`registeredAt`, persisted by the workspace registry and exposed additively
+  on `WebWorkspaceSummaryV1`); activating sessions no longer reshuffles the tree.
+  Pinned projects keep `pinnedOrder` first.
+
+## [0.3.24] — 2026-10-13
+
+> **Status: published.** Released as `@orion-agents/orion-code@0.3.24` from
+> `refs/tags/v0.3.24`, and merged to `main` as `85fadb4` (#268). Session
+> navigation & responsiveness for the Web Workbench. Plan:
+> `docs/plan/v0.3.24-plan.md`. GitHub Release:
+> https://github.com/orion-agents/orion-code/releases/tag/v0.3.24
 
 ### Fixed
 

package/README.md

@@ -2,9 +2,12 @@
 
 Local-first, goal-driven coding agent for the terminal and browser.
 
-> v0.3.24 development focus — Web session responsiveness: Session-scoped request admission,
-> cached foreground switching, retained live views, and bounded Git probes during creation.
-> Built on the merged v0.3.23 source (`6ed47fd`, #266).
+> v0.3.25 candidate — open. Four open-issue fixes: the Git conflict view reads the edited
+> working file from the filesystem (#269), file history walks the requested revision
+> (#270), model switching gates the compact preflight on effective input budgets (#271),
+> and the left project navigation keeps a stable registration order (#272). The previous
+> release 0.3.24 is on npm (registry `latest`), tagged `v0.3.24` (`85fadb4`, #268) and
+> released on GitHub.
 
 [中文说明](README.zh-CN.md) ·
 [v0.3.24 plan](docs/plan/v0.3.24-plan.md) ·
@@ -167,10 +170,10 @@ user extension boundaries.
 Node.js 22.12+, 24, and 26 are supported. Use Node 24 LTS for production or Node 26 Current for
 current development environments. Node 20 is upstream EOL and is no longer a v0.3 runtime.
 
-To install the pinned v0.3.24 package when it is available on npm:
+To install the pinned v0.3.25 package when it is available on npm:
 
 ```bash
-npm install -g @orion-agents/orion-code@0.3.24
+npm install -g @orion-agents/orion-code@0.3.25
 orion --version
 orion doctor
 ```

package/README.zh-CN.md

@@ -2,8 +2,10 @@
 
 面向终端与浏览器、本地优先的目标驱动 Coding Agent。
 
-> v0.3.24 开发重点：Web 会话响应性。发送按会话等待、有效缓存即时切换、保留实时显示内容，
-> 新建使用有界 Git 探测。基于已合并的 v0.3.23 源码（`6ed47fd`，#266）。
+> v0.3.25 候选版本：进行中。四个开放 issue 修复：Git 冲突视图从文件系统读取已编辑的
+> 工作区文件（#269）、文件历史按请求的 revision 遍历（#270）、模型切换按有效输入预算
+> 触发压缩预检（#271）、左侧项目导航保持稳定注册序（#272）。上一版 0.3.24 已发布 npm
+> （registry `latest`）、打 tag `v0.3.24`（`85fadb4`，#268）并发布 GitHub Release。
 
 [English](README.md) ·
 [v0.3.24 方案](docs/plan/v0.3.24-plan.md) ·
@@ -98,10 +100,10 @@ MCP 仍是用户可见的扩展边界。
 支持 Node.js 22.12+、24 和 26。生产环境建议使用 Node 24 LTS，当前开发环境也支持 Node 26
 Current。Node 20 已结束上游维护，不再属于 v0.3 Runtime 合同。
 
-v0.3.24 在 npm 可用后，可安装固定版本：
+v0.3.25 在 npm 可用后，可安装固定版本：
 
 ```bash
-npm install -g @orion-agents/orion-code@0.3.24
+npm install -g @orion-agents/orion-code@0.3.25
 orion --version
 orion doctor
 ```

package/dist/runtime/model-coordinator.d.ts

@@ -94,4 +94,5 @@ export declare class ModelCoordinator extends EventEmitter {
     private validateTargetClient;
     private commitResolvedTarget;
 }
+export declare function resolveProfileSafeInputBudget(profile: ResolvedModelProfile): number;
 //# sourceMappingURL=model-coordinator.d.ts.map

package/dist/runtime/model-coordinator.js

@@ -11,6 +11,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModelCoordinator = void 0;
 exports.validateModelSwitchCompactReceipt = validateModelSwitchCompactReceipt;
+exports.resolveProfileSafeInputBudget = resolveProfileSafeInputBudget;
 const events_1 = require("events");
 function validateModelSwitchCompactReceipt(receipt, targetTokens, safeInputBudget = targetTokens) {
     if (receipt.status === 'rejected')
@@ -114,7 +115,9 @@ class ModelCoordinator extends events_1.EventEmitter {
             if (clientError)
                 return { success: false, error: clientError };
             const prev = this.current;
-            if (!prev || target.resolvedContextWindow >= prev.resolvedContextWindow) {
+            // v0.3.25 #271 — same budget gate as commitSwitch: the effective input
+            // budgets decide, not raw context windows.
+            if (!prev || resolveProfileSafeInputBudget(target) >= resolveProfileSafeInputBudget(prev)) {
                 this.commitResolvedTarget(target, prev);
                 return {
                     success: true,
@@ -190,7 +193,11 @@ class ModelCoordinator extends events_1.EventEmitter {
         let compacted = false;
         let compactRequired = false;
         let compactPreflight = 'not_required';
-        if (prev && target.resolvedContextWindow < prev.resolvedContextWindow) {
+        // v0.3.25 #271 — gate the preflight on the effective input budgets, not raw
+        // context windows: a target with the same (or larger) window but a larger
+        // output reserve can still have a smaller safe input budget, and the
+        // unchanged history would exceed it without any compact.
+        if (prev && resolveProfileSafeInputBudget(target) < resolveProfileSafeInputBudget(prev)) {
             compactRequired = true;
             const safeInputBudget = resolveProfileSafeInputBudget(target);
             const targetTokens = Math.max(1, Math.floor(safeInputBudget * 0.65));

package/dist/runtime/session-composer-control.js

@@ -9,6 +9,7 @@ const effort_1 = require("../services/effort");
 const global_config_1 = require("../services/global-config");
 const session_storage_1 = require("../services/session-storage");
 const token_estimate_1 = require("../utils/token-estimate");
+const model_coordinator_1 = require("./model-coordinator");
 const canonical_1 = require("./protocol/canonical");
 class SessionComposerControlError extends Error {
     constructor(code, message) {
@@ -96,7 +97,10 @@ class SessionComposerControlServiceV1 {
                 toModelId: profile.id,
                 requestedEffort,
                 compacted: false,
-                compactRequired: profile.resolvedContextWindow < this.project(session, true).model.contextWindow,
+                // v0.3.25 #271 — same gate as the live path: the effective input
+                // budgets decide, not raw context windows.
+                compactRequired: (0, model_coordinator_1.resolveProfileSafeInputBudget)(profile) <
+                    (0, model_coordinator_1.resolveProfileSafeInputBudget)(this.resolveProfile(session.model)),
                 compactPreflight: 'deferred',
                 appliesFrom: 'next-logical-request',
                 sessionPreferencesDigest: (0, canonical_1.digestRuntimeValue)({

package/dist/services/workspace-registry.d.ts

@@ -3,6 +3,15 @@ export interface WorkspaceRegistryEntryV1 {
     readonly canonicalPath: string;
     readonly label: string;
     readonly lastActivatedAt: string;
+    /**
+     * v0.3.25 #272 — when the workspace was first registered. Navigation order is
+     * derived from this stable timestamp; `lastActivatedAt` no longer reorders
+     * the tree when sessions are activated. Documents persisted before this field
+     * existed are backfilled from `lastActivatedAt` on parse (and persisted with
+     * the backfilled value on the next write), which keeps the migration
+     * deterministic.
+     */
+    readonly registeredAt: string;
     readonly pinnedOrder?: number;
 }
 export interface WorkspaceRegistryOptions {

package/dist/services/workspace-registry.js

@@ -47,6 +47,7 @@ class WorkspaceRegistryV1 {
                 canonicalPath,
                 label: workspaceLabel(canonicalPath),
                 lastActivatedAt: options.activated ? now : (existing?.lastActivatedAt ?? now),
+                registeredAt: existing?.registeredAt ?? now,
                 ...(existing?.pinnedOrder !== undefined ? { pinnedOrder: existing.pinnedOrder } : {}),
             });
             const entries = existing
@@ -74,6 +75,7 @@ class WorkspaceRegistryV1 {
                     canonicalPath: path,
                     label: workspaceLabel(path),
                     lastActivatedAt: path === active ? now : (existing?.lastActivatedAt ?? now),
+                    registeredAt: existing?.registeredAt ?? now,
                     ...(existing?.pinnedOrder !== undefined ? { pinnedOrder: existing.pinnedOrder } : {}),
                 }));
             }
@@ -102,6 +104,7 @@ class WorkspaceRegistryV1 {
                 canonicalPath: target.canonicalPath,
                 label: target.label,
                 lastActivatedAt: target.lastActivatedAt,
+                registeredAt: target.registeredAt,
                 ...(pinned ? { pinnedOrder: target.pinnedOrder ?? currentMax + 1 } : {}),
             });
             this.writeDocument(document.entries.map(entry => (entry.id === id ? updated : entry)));
@@ -189,6 +192,11 @@ function parseEntry(value) {
         !row.label.trim() ||
         typeof row.lastActivatedAt !== 'string' ||
         !Number.isFinite(Date.parse(row.lastActivatedAt)) ||
+        // v0.3.25 #272 — older documents have no registeredAt; backfill from
+        // lastActivatedAt so the migration is deterministic and the write-back
+        // persists the stable value.
+        (row.registeredAt !== undefined &&
+            (typeof row.registeredAt !== 'string' || !Number.isFinite(Date.parse(row.registeredAt)))) ||
         (row.pinnedOrder !== undefined &&
             (!Number.isSafeInteger(row.pinnedOrder) || Number(row.pinnedOrder) < 1))) {
         return invalidDocument();
@@ -198,6 +206,7 @@ function parseEntry(value) {
         canonicalPath: row.canonicalPath,
         label: row.label,
         lastActivatedAt: row.lastActivatedAt,
+        registeredAt: typeof row.registeredAt === 'string' ? row.registeredAt : row.lastActivatedAt,
         ...(row.pinnedOrder !== undefined ? { pinnedOrder: Number(row.pinnedOrder) } : {}),
     });
 }
@@ -209,8 +218,10 @@ function compareEntries(left, right) {
     const rightPinned = right.pinnedOrder ?? Number.MAX_SAFE_INTEGER;
     if (leftPinned !== rightPinned)
         return leftPinned - rightPinned;
-    const recent = Date.parse(right.lastActivatedAt) - Date.parse(left.lastActivatedAt);
-    return recent || left.label.localeCompare(right.label) || left.id.localeCompare(right.id);
+    // v0.3.25 #272 — stable registration order: activating a session must not
+    // reorder the navigation tree, so lastActivatedAt no longer participates.
+    const registration = Date.parse(left.registeredAt) - Date.parse(right.registeredAt);
+    return registration || left.label.localeCompare(right.label) || left.id.localeCompare(right.id);
 }
 function freezeEntries(entries) {
     return Object.freeze([...entries].sort(compareEntries).map(entry => Object.freeze({ ...entry })));

package/dist/web/git-history-service.js

@@ -572,11 +572,14 @@ function createGitHistoryReader(options) {
             // `--follow` only accepts a single path, which is exactly this case. It explains its own
             // limits for copies and complex merges (plan G6) — we surface `followed` rather than
             // pretending tracking is complete.
+            // v0.3.25 #270 — the validated revision must reach the log command: it was
+            // previously used only for the existence check, so every query walked HEAD.
             const raw = await runGit([
                 'log',
                 `--max-count=${limit + 1}`,
                 `--format=${LIST_FORMAT}${RECORD_SEPARATOR}`,
                 '--follow',
+                target,
                 '--',
                 path,
             ]);

package/dist/web/git-read-model-service.d.ts

@@ -207,6 +207,15 @@ export declare class GitReadModelServiceV1 {
     }): Promise<GitDiffDocumentV2>;
     private versionReaderInstance?;
     private versionReader;
+    /**
+     * v0.3.25 #269 — reads one working-tree file for the conflict view, refusing
+     * to leave the repository: the requested relative path (already guarded as
+     * relative and non-sensitive by the version reader) is resolved against the
+     * repository root and both the file's real path and its parent's real path
+     * must stay inside the root's real path. Returns null instead of throwing so
+     * a missing or unreadable file reads as an absent worktree version.
+     */
+    private readContainedWorktreeFile;
     /**
      * v0.3.17 S5 — base / ours / theirs / worktree for a conflicted file.
      *

package/dist/web/git-read-model-service.js

@@ -6,6 +6,7 @@ exports.assertRelativeGitPath = assertRelativeGitPath;
 const child_process_1 = require("child_process");
 const crypto_1 = require("crypto");
 const fs_1 = require("fs");
+const promises_1 = require("fs/promises");
 const path_1 = require("path");
 const redaction_1 = require("../services/redaction");
 const errors_1 = require("./errors");
@@ -349,9 +350,43 @@ class GitReadModelServiceV1 {
         this.versionReaderInstance ?? (this.versionReaderInstance = (0, git_version_service_1.createGitVersionReader)({
             runGit: async (args) => this.runGit(args, await this.requireRepositoryRoot()),
             runGitBytes: async (args) => this.runGitBytes(args, await this.requireRepositoryRoot()),
+            readWorktreeFile: async (relativePath) => this.readContainedWorktreeFile(relativePath),
         }));
         return this.versionReaderInstance;
     }
+    /**
+     * v0.3.25 #269 — reads one working-tree file for the conflict view, refusing
+     * to leave the repository: the requested relative path (already guarded as
+     * relative and non-sensitive by the version reader) is resolved against the
+     * repository root and both the file's real path and its parent's real path
+     * must stay inside the root's real path. Returns null instead of throwing so
+     * a missing or unreadable file reads as an absent worktree version.
+     */
+    async readContainedWorktreeFile(relativePath) {
+        let root;
+        try {
+            root = (0, fs_1.realpathSync)(await this.requireRepositoryRoot());
+        }
+        catch {
+            return null;
+        }
+        try {
+            const absolute = (0, path_1.resolve)(root, relativePath);
+            const fileReal = (0, fs_1.realpathSync)(absolute);
+            const parentReal = (0, fs_1.realpathSync)((0, path_1.resolve)(fileReal, '..'));
+            if (fileReal !== root && !fileReal.startsWith(root + path_1.sep))
+                return null;
+            if (parentReal !== root && !parentReal.startsWith(root + path_1.sep))
+                return null;
+            const stat = (0, fs_1.statSync)(fileReal);
+            if (!stat.isFile())
+                return null;
+            return await (0, promises_1.readFile)(fileReal);
+        }
+        catch {
+            return null;
+        }
+    }
     /**
      * v0.3.17 S5 — base / ours / theirs / worktree for a conflicted file.
      *

package/dist/web/git-version-service.d.ts

@@ -66,6 +66,14 @@ export interface GitVersionReaderOptions {
     readonly runGit: (args: readonly string[]) => Promise<string>;
     /** Runs git and returns raw bytes, for content that may not be valid UTF-8. */
     readonly runGitBytes: (args: readonly string[]) => Promise<Buffer>;
+    /**
+     * v0.3.25 #269 — reads one working-tree file relative to the repository root,
+     * returning null when it does not exist or cannot be read safely. The
+     * `worktree` conflict version must come from the filesystem: `hash-object`
+     * without `-w` computes an OID that is not in the object database, so any
+     * edited working file made `cat-file` fail the whole conflict response.
+     */
+    readonly readWorktreeFile?: (relativePath: string) => Promise<Buffer | null>;
 }
 export declare function createGitVersionReader(options: GitVersionReaderOptions): GitVersionReader;
 //# sourceMappingURL=git-version-service.d.ts.map

package/dist/web/git-version-service.js

@@ -85,28 +85,25 @@ function parseLfsPointer(head) {
     });
 }
 function createGitVersionReader(options) {
-    const { runGit, runGitBytes } = options;
+    const { runGit, runGitBytes, readWorktreeFile } = options;
+    /** Absent version — the label legitimately has no content for this shape. */
+    const absentVersion = (label) => Object.freeze({
+        label,
+        oid: null,
+        exists: false,
+        binary: false,
+        byteSize: 0,
+        truncated: false,
+        content: null,
+        lfs: null,
+    });
     /**
-     * Reads one blob by OID, bounded, with binary and LFS detection.
-     *
-     * The size is read first so an enormous historical file is reported by its size instead of
-     * being pulled into memory just to be truncated.
+     * v0.3.25 #269 — decodes already-fetched bytes into a version, shared by the
+     * object-database reader and the working-tree reader so both apply the same
+     * size bound, binary probe and LFS-pointer detection.
      */
-    const readVersion = async (label, oid) => {
-        if (oid === null) {
-            return Object.freeze({
-                label,
-                oid: null,
-                exists: false,
-                binary: false,
-                byteSize: 0,
-                truncated: false,
-                content: null,
-                lfs: null,
-            });
-        }
-        const sizeRaw = (await runGit(['cat-file', '-s', oid])).trim();
-        const byteSize = Number(sizeRaw) || 0;
+    const versionFromBytes = (label, oid, bytes) => {
+        const byteSize = bytes.length;
         if (byteSize > MAX_VERSION_BYTES) {
             return Object.freeze({
                 label,
@@ -119,7 +116,6 @@ function createGitVersionReader(options) {
                 lfs: null,
             });
         }
-        const bytes = await runGitBytes(['cat-file', 'blob', oid]);
         const probe = bytes.subarray(0, LFS_PROBE_BYTES).toString('utf8');
         const lfs = parseLfsPointer(probe);
         if (lfs) {
@@ -149,6 +145,31 @@ function createGitVersionReader(options) {
             dataUrl,
         });
     };
+    /**
+     * Reads one blob by OID, bounded, with binary and LFS detection.
+     *
+     * The size is read first so an enormous historical file is reported by its size instead of
+     * being pulled into memory just to be truncated.
+     */
+    const readVersion = async (label, oid) => {
+        if (oid === null)
+            return absentVersion(label);
+        const sizeRaw = (await runGit(['cat-file', '-s', oid])).trim();
+        const byteSize = Number(sizeRaw) || 0;
+        if (byteSize > MAX_VERSION_BYTES) {
+            return Object.freeze({
+                label,
+                oid,
+                exists: true,
+                binary: false,
+                byteSize,
+                truncated: true,
+                content: null,
+                lfs: null,
+            });
+        }
+        return versionFromBytes(label, oid, await runGitBytes(['cat-file', 'blob', oid]));
+    };
     return {
         async conflict(pathInput) {
             const path = assertRelativePath(pathInput);
@@ -168,15 +189,18 @@ function createGitVersionReader(options) {
                     continue;
                 stageOids.set(Number(stage), oid);
             }
-            const worktreeOid = (await runGit(['hash-object', '--path=' + path, '--', path]).catch(() => ''))
-                .toString()
-                .trim();
-            const worktreeExists = /^[0-9a-f]{7,64}$/iu.test(worktreeOid);
+            // v0.3.25 #269 — the working file is read from the filesystem. The previous
+            // `hash-object` (without -w) → `cat-file` chain only worked while the edited
+            // content happened to match an object git already stored; any real edit made
+            // `cat-file` fail the entire conflict response.
+            const worktreeBytes = await readWorktreeFile?.(path);
             const [base, ours, theirs, worktree] = await Promise.all([
                 readVersion('base', stageOids.get(1) ?? null),
                 readVersion('ours', stageOids.get(2) ?? null),
                 readVersion('theirs', stageOids.get(3) ?? null),
-                worktreeExists ? readVersion('worktree', worktreeOid) : readVersion('worktree', null),
+                worktreeBytes
+                    ? Promise.resolve(versionFromBytes('worktree', null, worktreeBytes))
+                    : Promise.resolve(absentVersion('worktree')),
             ]);
             const hasBase = stageOids.has(1);
             const hasOurs = stageOids.has(2);

package/dist/web/protocol.d.ts

@@ -361,6 +361,11 @@ export interface WebWorkspaceSummaryV1 {
     readonly available: boolean;
     readonly sessionCount: number;
     readonly lastActivatedAt: string;
+    /**
+     * v0.3.25 #272 — when the workspace was first registered. The navigation's
+     * stable default order is derived from this; optional for older Hosts.
+     */
+    readonly registeredAt?: string;
     readonly pinnedOrder?: number;
 }
 export interface WebWorkspaceProjectSummaryV1 {

package/dist/web/workbench-controller.js

@@ -238,6 +238,7 @@ class WebWorkbenchController {
                 available,
                 sessionCount: counts.get(entry.canonicalPath) ?? 0,
                 lastActivatedAt: entry.lastActivatedAt,
+                registeredAt: entry.registeredAt,
                 ...(entry.pinnedOrder !== undefined ? { pinnedOrder: entry.pinnedOrder } : {}),
             });
         }));

package/dist/web-client/assets/{FilesPanel-BjEDjE7l.js → FilesPanel-CdoCa8u0.js}

@@ -1 +1 @@
-import{r as a,j as e,I as D,s as be,C as ye,W as ge}from"./index-DZOlUgt6.js";import{u as Ce,R as Ne}from"./useAutoNotice-Ylj5bfSH.js";function Le({workspaceId:s,refreshEpoch:o,actions:l,navigatorWidthPx:r,onNavigatorWidthCommit:d,revealRequest:c}){const[f,m]=a.useState({}),[x,j]=a.useState(new Set(["workspace-root"])),[i,N]=a.useState(null),[F,B]=a.useState(""),[M,G]=a.useState(null),[Y,P]=a.useState(!1),[H,K]=a.useState(""),{notice:J,showNotice:$,clearNotice:V}=Ce(),[T,ue]=a.useState(""),[Z,_]=a.useState({}),[I,A]=a.useState(""),[O,R]=a.useState("view"),[L,w]=a.useState(""),[k,q]=a.useState(!1),[de,S]=a.useState(!1),[fe,me]=a.useState(""),[he,W]=a.useState(!1),h=a.useRef(0),C=a.useRef(0),ee=a.useRef(null),E=async(t,n=!1,y=h.current)=>{if(y!==h.current)return;const p=f[t],g=n?p?.nextCursor:void 0;if(!(n&&!g)){m(u=>({...u,[t]:{items:p?.items??[],nextCursor:p?.nextCursor??null,revision:p?.revision??"",loading:!0}}));try{const u=await l.listFiles(t,g??void 0);if(y!==h.current)return;m(v=>({...v,[t]:{items:n?ke(v[t]?.items??[],u.items):u.items,nextCursor:u.nextCursor,revision:u.revision,loading:!1}}))}catch(u){if(y!==h.current)return;if(n&&U(u)){$("目录已变化，已重新载入第一页。"),E(t,!1,y);return}m(v=>({...v,[t]:{items:v[t]?.items??[],nextCursor:v[t]?.nextCursor??null,revision:v[t]?.revision??"",loading:!1,error:z(u)}}))}}},Q=async(t=h.current)=>{try{const n=await l.gitStatus();if(t!==h.current)return;_(Se(n)),A(n.nextCursor?"Git 装饰仅显示首批 200 个变更；在 Git 面板继续分页查看。":"")}catch(n){if(t!==h.current)return;_({}),A(`Git 状态装饰不可用：${z(n)}`)}},te=a.useRef(s);a.useEffect(()=>{const t=h.current+1;h.current=t,C.current+=1;const n=te.current===s?ee.current:null;te.current=s,m({}),j(new Set(["workspace-root"])),N(n),B(""),G(null),P(!1),K(""),V(),_({}),A(""),s&&(E("workspace-root",!1,t),Q(t),n&&b(n,!1,!1,t))},[o,s]);const se=a.useRef(null),b=async(t,n=!1,y=!1,p=h.current,g=C.current+1)=>{if(p===h.current&&!(!t.readable||t.sensitive||X(t))){C.current=g,N(t),K(""),n||(B(""),G(null),P(!1),R("view"),w(""),S(!1)),y||V();try{const u=await l.readFileContent(t.id,n?M??void 0:void 0);if(p!==h.current||g!==C.current)return;P(u.binary),B(v=>n?`${v}${u.content??""}`:u.content??""),G(u.nextCursor),me(u.revision),y&&$("文件已变化，已从第一页重新载入。")}catch(u){if(p!==h.current||g!==C.current)return;if(n&&U(u)){await b(t,!1,!0,p,g);return}K(z(u))}}},re=De({selected:i,binary:Y,hasMorePages:M!==null}),xe=()=>{w(F),S(!1),R("edit")},ie=()=>{if(L!==F){W(!0);return}ne()},ne=()=>{R("view"),w(""),S(!1),W(!1)},je=async()=>{if(!(!i||k)){q(!0),S(!1);try{await l.writeFileContent(i.id,L,fe),R("view"),w(""),await b(i,!1,!0,h.current,C.current+1),$("已保存文件。","success"),Q()}catch(t){U(t)?S(!0):$(z(t),"error")}finally{q(!1)}}},ae=t=>{const n=new Set(x);n.has(t)?n.delete(t):(n.add(t),f[t]||E(t)),j(n)};a.useEffect(()=>{c&&se.current!==c.id&&(se.current=c.id,b({id:c.fileId,name:c.displayPath.split("/").pop()??c.displayPath,displayPath:c.displayPath,kind:"file",modifiedAt:new Date().toISOString(),sensitive:!1,readable:!0}))},[c?.id]),a.useEffect(()=>{ee.current=i},[i]);const pe=a.useMemo(()=>Object.values(f).flatMap(t=>t.items),[f]),oe=T.trim()?pe.filter(t=>t.name.toLocaleLowerCase().includes(T.toLocaleLowerCase())):null,ve=!!f["workspace-root"]?.loading;return e.jsxs("div",{className:"work-resource-panel files-panel",children:[e.jsxs("div",{className:"resource-toolbar",children:[e.jsxs("label",{className:"resource-search",children:[e.jsx("span",{className:"sr-only",children:"搜索已加载文件"}),e.jsx(D,{name:"search",size:16}),e.jsx("input",{type:"search",value:T,onChange:t=>ue(t.target.value),placeholder:"搜索已加载文件",title:"搜索仅覆盖已加载的目录和文件"})]}),e.jsx("button",{type:"button",className:"icon-button","aria-label":"刷新文件树","aria-busy":ve,onClick:()=>{E("workspace-root"),Q()},children:e.jsx(D,{name:"refresh",size:16})})]}),e.jsxs(Ne,{panelId:"files",navigatorWidthPx:r,onNavigatorWidthCommit:d,contentLabel:"文件预览",navigatorLabel:"工作区文件",handleLabel:"调整文件目录宽度",contentClassName:"file-preview",navigatorClassName:"file-tree",children:[e.jsxs(e.Fragment,{children:[I?e.jsx("p",{className:"resource-hint",role:"status",children:I}):null,oe?e.jsx(e.Fragment,{children:e.jsx("ul",{role:"list",className:"file-node-list search-results",children:oe.map(t=>e.jsx(ce,{node:t,depth:0,expanded:!1,selected:i?.id===t.id,gitLabels:Z[t.displayPath]??[],onToggle:ae,onSelect:n=>{b(n)}},t.id))})}):e.jsx(le,{parentId:"workspace-root",depth:0,directories:f,expanded:x,selectedId:i?.id,gitDecorations:Z,onToggle:ae,onSelect:t=>{b(t)},onLoadMore:t=>{E(t,!0)}})]}),e.jsxs(e.Fragment,{children:[J?e.jsx("p",{className:"resource-notice",role:"status",children:J.text}):null,i?e.jsxs(e.Fragment,{children:[e.jsxs("header",{children:[e.jsx("strong",{children:i.name}),e.jsx("span",{children:Fe(i.sizeBytes??0)})]}),H?e.jsx("p",{className:"resource-error",role:"alert",children:H}):Y?e.jsxs("div",{className:"resource-empty",children:[e.jsx(D,{name:"code",size:16}),e.jsx("strong",{title:"出于安全和性能考虑，只显示元数据。",children:"二进制文件"})]}):e.jsxs(e.Fragment,{children:[e.jsx("div",{className:"file-preview-actions",children:O==="view"?e.jsx("button",{type:"button",className:"text-button",disabled:!re,title:re?void 0:"仅支持编辑 512 KB 内的 UTF-8 文本文件",onClick:xe,children:"编辑"}):e.jsxs(e.Fragment,{children:[e.jsx("button",{type:"button",className:"primary-button",disabled:k||L===F,"aria-busy":k,onClick:()=>{je()},children:k?"保存中…":"保存"}),e.jsx("button",{type:"button",className:"text-button",disabled:k,onClick:ie,children:"取消"})]})}),de?e.jsxs("p",{className:"resource-error",role:"alert",children:["文件已在别处变更，保存被拒绝。",e.jsx("button",{type:"button",className:"text-button",onClick:()=>{b(i,!1,!0)},children:"重新加载"})]}):null,O==="edit"?e.jsx("textarea",{className:"file-editor",value:L,spellCheck:!1,"aria-label":`编辑文件 ${i.name}`,onChange:t=>w(t.target.value),onKeyDown:t=>{t.key==="Escape"&&(t.preventDefault(),ie())}}):e.jsx("pre",{tabIndex:0,className:"file-code-view","aria-label":`文件内容 ${i.name}`,children:be(F)})]}),M&&O==="view"?e.jsx("button",{type:"button",className:"secondary-button",onClick:()=>{b(i,!0)},children:"加载更多内容"}):null]}):e.jsxs("div",{className:"resource-empty",children:[e.jsx(D,{name:"workspace",size:16}),e.jsx("strong",{children:"选择文件预览"}),e.jsx("p",{title:"敏感文件、工作区外链接和二进制正文不会返回浏览器。",children:"受限内容不会返回浏览器。"})]})]})]}),e.jsx(ye,{open:he,onClose:()=>W(!1),title:"放弃未保存的修改？",body:"当前草稿尚未保存，放弃后将回到文件的最新内容。",confirmLabel:"放弃修改",danger:!0,onConfirm:ne})]})}function le({parentId:s,depth:o,directories:l,expanded:r,selectedId:d,gitDecorations:c,onToggle:f,onSelect:m,onLoadMore:x}){const j=l[s];return j?j.error?e.jsx("p",{className:"resource-error",role:"alert",children:j.error}):e.jsxs("ul",{role:"list",className:"file-node-list",children:[j.items.map(i=>{const N=r.has(i.id);return e.jsxs("li",{children:[e.jsx(ce,{node:i,depth:o,expanded:N,selected:d===i.id,gitLabels:c[i.displayPath]??[],onToggle:f,onSelect:m}),X(i)&&N?e.jsx(le,{parentId:i.id,depth:o+1,directories:l,expanded:r,selectedId:d,gitDecorations:c,onToggle:f,onSelect:m,onLoadMore:x}):null]},i.id)}),j.loading?e.jsx("li",{className:"resource-loading",children:"正在读取…"}):null,j.nextCursor?e.jsx("li",{children:e.jsx("button",{type:"button",className:"text-button",onClick:()=>x(s),children:"加载更多"})}):null]}):e.jsx("p",{className:"resource-loading",children:"正在读取…"})}function ce({node:s,depth:o,expanded:l,selected:r,gitLabels:d,onToggle:c,onSelect:f}){const m=s.sensitive||!s.readable,x=X(s);return e.jsxs("button",{type:"button",className:`file-node ${r?"selected":""} ${m?"blocked":""}`,style:{paddingInlineStart:`${8+o*15}px`},"aria-expanded":x?l:void 0,"aria-label":`${we(s)} ${s.name}${m?"，不可读取":""}${d.length?`，Git ${d.join("、")}`:""}`,onClick:()=>x?c(s.id):f(s),disabled:m,children:[e.jsx(D,{name:x?"workspace":"code",size:16}),e.jsx("span",{children:s.name}),s.kind==="symlink"?e.jsx("small",{children:"链接"}):null,s.sensitive?e.jsx("small",{children:"敏感"}):null,d.length?e.jsx("small",{className:"file-git-status",title:`Git ${d.join("、")}`,children:d.join(" · ")}):null]})}function we(s){return s.kind==="directory"?"目录":s.kind==="symlink"?s.targetKind==="directory"?"符号链接目录":"符号链接":"文件"}function X(s){return s.kind==="directory"||s.kind==="symlink"&&s.targetKind==="directory"}function ke(s,o){const l=new Map(s.map(r=>[r.id,r]));for(const r of o)l.set(r.id,r);return[...l.values()]}function Se(s){if(!s.hasWorktree)return{};const o=new Map,l=(r,d)=>{const c=r.replace(/\\/gu,"/").replace(/^\.\//u,"");if(!c)return;const f=o.get(c)??new Set;f.add(d),o.set(c,f);const m=c.split("/");for(let x=1;x<m.length;x+=1){const j=m.slice(0,x).join("/"),i=o.get(j)??new Set;i.add("含变更"),o.set(j,i)}};return s.conflicted.forEach(r=>l(r.path,"冲突")),s.staged.forEach(r=>l(r.path,"已暂存")),s.unstaged.forEach(r=>l(r.path,"未暂存")),s.untracked.forEach(r=>l(r.path,"未跟踪")),Object.fromEntries([...o].map(([r,d])=>[r,Object.freeze([...d])]))}const Ee=512*1024;function De(s){const{selected:o,binary:l,hasMorePages:r}=s;return!o||l||o.sensitive||!o.readable||r?!1:(o.sizeBytes??0)<=Ee}function Fe(s){return s<1024?`${s} B`:s<1048576?`${(s/1024).toFixed(1)} KB`:`${(s/1048576).toFixed(1)} MB`}function U(s){return s instanceof ge&&s.code==="file_revision_conflict"}function z(s){return s instanceof Error?s.message:"文件请求失败。"}export{Ee as FILE_EDIT_MAX_BYTES,Le as FilesPanel,De as canEditFileContent};
+import{r as a,j as e,I as D,s as be,C as ye,W as ge}from"./index-kQqA3li6.js";import{u as Ce,R as Ne}from"./useAutoNotice-DPXFWIwK.js";function Le({workspaceId:s,refreshEpoch:o,actions:l,navigatorWidthPx:r,onNavigatorWidthCommit:d,revealRequest:c}){const[f,m]=a.useState({}),[x,j]=a.useState(new Set(["workspace-root"])),[i,N]=a.useState(null),[F,B]=a.useState(""),[M,G]=a.useState(null),[Y,P]=a.useState(!1),[H,K]=a.useState(""),{notice:J,showNotice:$,clearNotice:V}=Ce(),[T,ue]=a.useState(""),[Z,_]=a.useState({}),[I,A]=a.useState(""),[O,R]=a.useState("view"),[L,w]=a.useState(""),[k,q]=a.useState(!1),[de,S]=a.useState(!1),[fe,me]=a.useState(""),[he,W]=a.useState(!1),h=a.useRef(0),C=a.useRef(0),ee=a.useRef(null),E=async(t,n=!1,y=h.current)=>{if(y!==h.current)return;const p=f[t],g=n?p?.nextCursor:void 0;if(!(n&&!g)){m(u=>({...u,[t]:{items:p?.items??[],nextCursor:p?.nextCursor??null,revision:p?.revision??"",loading:!0}}));try{const u=await l.listFiles(t,g??void 0);if(y!==h.current)return;m(v=>({...v,[t]:{items:n?ke(v[t]?.items??[],u.items):u.items,nextCursor:u.nextCursor,revision:u.revision,loading:!1}}))}catch(u){if(y!==h.current)return;if(n&&U(u)){$("目录已变化，已重新载入第一页。"),E(t,!1,y);return}m(v=>({...v,[t]:{items:v[t]?.items??[],nextCursor:v[t]?.nextCursor??null,revision:v[t]?.revision??"",loading:!1,error:z(u)}}))}}},Q=async(t=h.current)=>{try{const n=await l.gitStatus();if(t!==h.current)return;_(Se(n)),A(n.nextCursor?"Git 装饰仅显示首批 200 个变更；在 Git 面板继续分页查看。":"")}catch(n){if(t!==h.current)return;_({}),A(`Git 状态装饰不可用：${z(n)}`)}},te=a.useRef(s);a.useEffect(()=>{const t=h.current+1;h.current=t,C.current+=1;const n=te.current===s?ee.current:null;te.current=s,m({}),j(new Set(["workspace-root"])),N(n),B(""),G(null),P(!1),K(""),V(),_({}),A(""),s&&(E("workspace-root",!1,t),Q(t),n&&b(n,!1,!1,t))},[o,s]);const se=a.useRef(null),b=async(t,n=!1,y=!1,p=h.current,g=C.current+1)=>{if(p===h.current&&!(!t.readable||t.sensitive||X(t))){C.current=g,N(t),K(""),n||(B(""),G(null),P(!1),R("view"),w(""),S(!1)),y||V();try{const u=await l.readFileContent(t.id,n?M??void 0:void 0);if(p!==h.current||g!==C.current)return;P(u.binary),B(v=>n?`${v}${u.content??""}`:u.content??""),G(u.nextCursor),me(u.revision),y&&$("文件已变化，已从第一页重新载入。")}catch(u){if(p!==h.current||g!==C.current)return;if(n&&U(u)){await b(t,!1,!0,p,g);return}K(z(u))}}},re=De({selected:i,binary:Y,hasMorePages:M!==null}),xe=()=>{w(F),S(!1),R("edit")},ie=()=>{if(L!==F){W(!0);return}ne()},ne=()=>{R("view"),w(""),S(!1),W(!1)},je=async()=>{if(!(!i||k)){q(!0),S(!1);try{await l.writeFileContent(i.id,L,fe),R("view"),w(""),await b(i,!1,!0,h.current,C.current+1),$("已保存文件。","success"),Q()}catch(t){U(t)?S(!0):$(z(t),"error")}finally{q(!1)}}},ae=t=>{const n=new Set(x);n.has(t)?n.delete(t):(n.add(t),f[t]||E(t)),j(n)};a.useEffect(()=>{c&&se.current!==c.id&&(se.current=c.id,b({id:c.fileId,name:c.displayPath.split("/").pop()??c.displayPath,displayPath:c.displayPath,kind:"file",modifiedAt:new Date().toISOString(),sensitive:!1,readable:!0}))},[c?.id]),a.useEffect(()=>{ee.current=i},[i]);const pe=a.useMemo(()=>Object.values(f).flatMap(t=>t.items),[f]),oe=T.trim()?pe.filter(t=>t.name.toLocaleLowerCase().includes(T.toLocaleLowerCase())):null,ve=!!f["workspace-root"]?.loading;return e.jsxs("div",{className:"work-resource-panel files-panel",children:[e.jsxs("div",{className:"resource-toolbar",children:[e.jsxs("label",{className:"resource-search",children:[e.jsx("span",{className:"sr-only",children:"搜索已加载文件"}),e.jsx(D,{name:"search",size:16}),e.jsx("input",{type:"search",value:T,onChange:t=>ue(t.target.value),placeholder:"搜索已加载文件",title:"搜索仅覆盖已加载的目录和文件"})]}),e.jsx("button",{type:"button",className:"icon-button","aria-label":"刷新文件树","aria-busy":ve,onClick:()=>{E("workspace-root"),Q()},children:e.jsx(D,{name:"refresh",size:16})})]}),e.jsxs(Ne,{panelId:"files",navigatorWidthPx:r,onNavigatorWidthCommit:d,contentLabel:"文件预览",navigatorLabel:"工作区文件",handleLabel:"调整文件目录宽度",contentClassName:"file-preview",navigatorClassName:"file-tree",children:[e.jsxs(e.Fragment,{children:[I?e.jsx("p",{className:"resource-hint",role:"status",children:I}):null,oe?e.jsx(e.Fragment,{children:e.jsx("ul",{role:"list",className:"file-node-list search-results",children:oe.map(t=>e.jsx(ce,{node:t,depth:0,expanded:!1,selected:i?.id===t.id,gitLabels:Z[t.displayPath]??[],onToggle:ae,onSelect:n=>{b(n)}},t.id))})}):e.jsx(le,{parentId:"workspace-root",depth:0,directories:f,expanded:x,selectedId:i?.id,gitDecorations:Z,onToggle:ae,onSelect:t=>{b(t)},onLoadMore:t=>{E(t,!0)}})]}),e.jsxs(e.Fragment,{children:[J?e.jsx("p",{className:"resource-notice",role:"status",children:J.text}):null,i?e.jsxs(e.Fragment,{children:[e.jsxs("header",{children:[e.jsx("strong",{children:i.name}),e.jsx("span",{children:Fe(i.sizeBytes??0)})]}),H?e.jsx("p",{className:"resource-error",role:"alert",children:H}):Y?e.jsxs("div",{className:"resource-empty",children:[e.jsx(D,{name:"code",size:16}),e.jsx("strong",{title:"出于安全和性能考虑，只显示元数据。",children:"二进制文件"})]}):e.jsxs(e.Fragment,{children:[e.jsx("div",{className:"file-preview-actions",children:O==="view"?e.jsx("button",{type:"button",className:"text-button",disabled:!re,title:re?void 0:"仅支持编辑 512 KB 内的 UTF-8 文本文件",onClick:xe,children:"编辑"}):e.jsxs(e.Fragment,{children:[e.jsx("button",{type:"button",className:"primary-button",disabled:k||L===F,"aria-busy":k,onClick:()=>{je()},children:k?"保存中…":"保存"}),e.jsx("button",{type:"button",className:"text-button",disabled:k,onClick:ie,children:"取消"})]})}),de?e.jsxs("p",{className:"resource-error",role:"alert",children:["文件已在别处变更，保存被拒绝。",e.jsx("button",{type:"button",className:"text-button",onClick:()=>{b(i,!1,!0)},children:"重新加载"})]}):null,O==="edit"?e.jsx("textarea",{className:"file-editor",value:L,spellCheck:!1,"aria-label":`编辑文件 ${i.name}`,onChange:t=>w(t.target.value),onKeyDown:t=>{t.key==="Escape"&&(t.preventDefault(),ie())}}):e.jsx("pre",{tabIndex:0,className:"file-code-view","aria-label":`文件内容 ${i.name}`,children:be(F)})]}),M&&O==="view"?e.jsx("button",{type:"button",className:"secondary-button",onClick:()=>{b(i,!0)},children:"加载更多内容"}):null]}):e.jsxs("div",{className:"resource-empty",children:[e.jsx(D,{name:"workspace",size:16}),e.jsx("strong",{children:"选择文件预览"}),e.jsx("p",{title:"敏感文件、工作区外链接和二进制正文不会返回浏览器。",children:"受限内容不会返回浏览器。"})]})]})]}),e.jsx(ye,{open:he,onClose:()=>W(!1),title:"放弃未保存的修改？",body:"当前草稿尚未保存，放弃后将回到文件的最新内容。",confirmLabel:"放弃修改",danger:!0,onConfirm:ne})]})}function le({parentId:s,depth:o,directories:l,expanded:r,selectedId:d,gitDecorations:c,onToggle:f,onSelect:m,onLoadMore:x}){const j=l[s];return j?j.error?e.jsx("p",{className:"resource-error",role:"alert",children:j.error}):e.jsxs("ul",{role:"list",className:"file-node-list",children:[j.items.map(i=>{const N=r.has(i.id);return e.jsxs("li",{children:[e.jsx(ce,{node:i,depth:o,expanded:N,selected:d===i.id,gitLabels:c[i.displayPath]??[],onToggle:f,onSelect:m}),X(i)&&N?e.jsx(le,{parentId:i.id,depth:o+1,directories:l,expanded:r,selectedId:d,gitDecorations:c,onToggle:f,onSelect:m,onLoadMore:x}):null]},i.id)}),j.loading?e.jsx("li",{className:"resource-loading",children:"正在读取…"}):null,j.nextCursor?e.jsx("li",{children:e.jsx("button",{type:"button",className:"text-button",onClick:()=>x(s),children:"加载更多"})}):null]}):e.jsx("p",{className:"resource-loading",children:"正在读取…"})}function ce({node:s,depth:o,expanded:l,selected:r,gitLabels:d,onToggle:c,onSelect:f}){const m=s.sensitive||!s.readable,x=X(s);return e.jsxs("button",{type:"button",className:`file-node ${r?"selected":""} ${m?"blocked":""}`,style:{paddingInlineStart:`${8+o*15}px`},"aria-expanded":x?l:void 0,"aria-label":`${we(s)} ${s.name}${m?"，不可读取":""}${d.length?`，Git ${d.join("、")}`:""}`,onClick:()=>x?c(s.id):f(s),disabled:m,children:[e.jsx(D,{name:x?"workspace":"code",size:16}),e.jsx("span",{children:s.name}),s.kind==="symlink"?e.jsx("small",{children:"链接"}):null,s.sensitive?e.jsx("small",{children:"敏感"}):null,d.length?e.jsx("small",{className:"file-git-status",title:`Git ${d.join("、")}`,children:d.join(" · ")}):null]})}function we(s){return s.kind==="directory"?"目录":s.kind==="symlink"?s.targetKind==="directory"?"符号链接目录":"符号链接":"文件"}function X(s){return s.kind==="directory"||s.kind==="symlink"&&s.targetKind==="directory"}function ke(s,o){const l=new Map(s.map(r=>[r.id,r]));for(const r of o)l.set(r.id,r);return[...l.values()]}function Se(s){if(!s.hasWorktree)return{};const o=new Map,l=(r,d)=>{const c=r.replace(/\\/gu,"/").replace(/^\.\//u,"");if(!c)return;const f=o.get(c)??new Set;f.add(d),o.set(c,f);const m=c.split("/");for(let x=1;x<m.length;x+=1){const j=m.slice(0,x).join("/"),i=o.get(j)??new Set;i.add("含变更"),o.set(j,i)}};return s.conflicted.forEach(r=>l(r.path,"冲突")),s.staged.forEach(r=>l(r.path,"已暂存")),s.unstaged.forEach(r=>l(r.path,"未暂存")),s.untracked.forEach(r=>l(r.path,"未跟踪")),Object.fromEntries([...o].map(([r,d])=>[r,Object.freeze([...d])]))}const Ee=512*1024;function De(s){const{selected:o,binary:l,hasMorePages:r}=s;return!o||l||o.sensitive||!o.readable||r?!1:(o.sizeBytes??0)<=Ee}function Fe(s){return s<1024?`${s} B`:s<1048576?`${(s/1024).toFixed(1)} KB`:`${(s/1048576).toFixed(1)} MB`}function U(s){return s instanceof ge&&s.code==="file_revision_conflict"}function z(s){return s instanceof Error?s.message:"文件请求失败。"}export{Ee as FILE_EDIT_MAX_BYTES,Le as FilesPanel,De as canEditFileContent};