@openspecui/core 2.1.7 → 2.2.0

package/dist/index.d.mts

@@ -1861,6 +1861,7 @@ type DashboardGitEntry = DashboardGitCommitEntry | DashboardGitUncommittedEntry;
 interface DashboardGitWorktree {
   path: string;
   relativePath: string;
+  pathAvailable: boolean;
   branchName: string;
   detached: boolean;
   isCurrent: boolean;
@@ -2412,6 +2413,64 @@ interface ExportSnapshot {
   };
 }
 //#endregion
+//#region src/git-panel-types.d.ts
+type GitEntryCursor = string;
+type GitEntrySelector = {
+  type: 'uncommitted';
+} | {
+  type: 'commit';
+  hash: string;
+};
+type GitFileChangeType = 'added' | 'modified' | 'deleted' | 'renamed' | 'copied' | 'typechanged' | 'unmerged' | 'unknown';
+type GitPatchState = 'available' | 'binary' | 'too-large' | 'unavailable';
+type GitEntryFileSource = 'tracked' | 'untracked';
+type GitEntryFileDiff = ({
+  state: 'ready';
+} & DashboardGitDiffStats) | {
+  state: 'loading' | 'unavailable';
+  files: number;
+};
+type GitWorktreeSummary = Omit<DashboardGitWorktree, 'entries'>;
+interface GitEntriesPage {
+  items: DashboardGitEntry[];
+  nextCursor: GitEntryCursor | null;
+}
+interface GitEntryFileSummary {
+  fileId: string;
+  source: GitEntryFileSource;
+  path: string;
+  displayPath: string;
+  previousPath: string | null;
+  changeType: GitFileChangeType;
+  diff: GitEntryFileDiff;
+}
+interface GitEntryFilePatch extends GitEntryFileSummary {
+  patch: string | null;
+  state: GitPatchState;
+}
+interface GitEntryShell {
+  entry: DashboardGitEntry | null;
+  files: GitEntryFileSummary[];
+}
+interface GitEntryPatch {
+  entry: DashboardGitEntry | null;
+  file: GitEntryFilePatch | null;
+}
+type GitPatchFile = GitEntryFilePatch;
+interface GitEntryDetail {
+  entry: DashboardGitEntry | null;
+  files: GitEntryFilePatch[];
+}
+interface GitWorktreeOverview {
+  defaultBranch: string;
+  currentWorktree: GitWorktreeSummary | null;
+  otherWorktrees: GitWorktreeSummary[];
+}
+interface GitWorktreeHandoff {
+  projectDir: string;
+  serverUrl: string;
+}
+//#endregion
 //#region src/opsx-kernel.d.ts
 type TemplateContentMap = Record<string, {
   content: string | null;
@@ -3008,4 +3067,4 @@ type PtyServerMessage = z.infer<typeof PtyServerMessageSchema>;
 type PtySessionInfo = z.infer<typeof PtySessionInfoSchema>;
 type PtyPlatform = z.infer<typeof PtyPlatformSchema>;
 //#endregion
-export { type AIToolOption, AI_TOOLS, type ApplyInstructions, ApplyInstructionsSchema, type ApplyTask, ApplyTaskSchema, type ArchiveMeta, type ArtifactInstructions, ArtifactInstructionsSchema, type ArtifactStatus, ArtifactStatusSchema, CODE_EDITOR_THEME_VALUES, type Change, type ChangeFile, ChangeFileSchema, type ChangeMeta, ChangeSchema, type ChangeStatus, ChangeStatusSchema, CliExecutor, type CliResult, type CliRunnerAttempt, type CliSniffResult, type CliStreamEvent, type CodeEditorTheme, CodeEditorThemeSchema, ConfigManager, DASHBOARD_METRIC_KEYS, DEFAULT_CONFIG, type DashboardCardAvailability, type DashboardConfig, DashboardConfigSchema, type DashboardGitCommitEntry, type DashboardGitDiffStats, type DashboardGitEntry, type DashboardGitSnapshot, type DashboardGitUncommittedEntry, type DashboardGitWorktree, type DashboardMetricKey, type DashboardOverview, type DashboardSummary, type DashboardTrendKind, type DashboardTrendMeta, type DashboardTrendPoint, type DashboardTriColorTrendPoint, type Delta, type DeltaOperation, DeltaOperationType, DeltaSchema, type DeltaSpec, DeltaSpecSchema, type DependencyInfo, DependencyInfoSchema, type ExportSnapshot, type FileChangeEvent, type FileChangeType, type HostedAppChannelKind, type HostedAppChannelManifest, type HostedAppCompatibilityEntry, type HostedAppVersionManifest, type HostedBackendHealthResponse, MarkdownParser, OFFICIAL_APP_BASE_URL, OpenSpecAdapter, type OpenSpecUIConfig, OpenSpecUIConfigSchema, type OpenSpecUIConfigUpdate, OpenSpecWatcher, OpsxKernel, type PathCallback, ProjectWatcher, type ProjectWatcherReinitializeReason, type ProjectWatcherRuntimeStatus, PtyAttachMessageSchema, PtyBufferResponseSchema, type PtyClientMessage, PtyClientMessageSchema, PtyCloseMessageSchema, PtyCreateMessageSchema, PtyCreatedResponseSchema, PtyErrorCodeSchema, PtyErrorResponseSchema, PtyExitResponseSchema, PtyInputMessageSchema, PtyListMessageSchema, PtyListResponseSchema, PtyOutputResponseSchema, type PtyPlatform, PtyPlatformSchema, PtyResizeMessageSchema, type PtyServerMessage, PtyServerMessageSchema, type PtySessionInfo, PtyTitleResponseSchema, ReactiveContext, ReactiveState, type ReactiveStateOptions, type Requirement, RequirementSchema, type ResolvedCliRunner, type SchemaArtifact, SchemaArtifactSchema, type SchemaDetail, SchemaDetailSchema, type SchemaInfo, SchemaInfoSchema, type SchemaResolution, SchemaResolutionSchema, type Spec, type SpecMeta, SpecSchema, TOOL_WORKFLOW_TO_SKILL_DIR, type Task, TaskSchema, type TemplateContentMap, type TemplatesMap, TemplatesSchema, type TerminalConfig, TerminalConfigSchema, type TerminalRendererEngine, TerminalRendererEngineSchema, type ToolConfig, type ToolInitDelivery, type ToolInitState, type ToolInitStatus, type ToolWorkflowId, VIRTUAL_PROJECT_DIRNAME, type ValidationIssue, type ValidationResult, Validator, type WatchEvent, type WatchEventType, type WatcherRuntimeStatus, acquireWatcher, buildCliRunnerCandidates, buildHostedLaunchUrl, buildHostedVersionManifestUrl, clearCache, closeAllProjectWatchers, closeAllWatchers, contextStorage, createCleanCliEnv, createFileChangeObservable, getActiveWatcherCount, getAllToolIds, getAllTools, getAvailableToolIds, getAvailableTools, getCacheSize, getConfiguredTools, getDefaultCliCommand, getDefaultCliCommandString, getDetectedProjectTools, getProjectWatcher, getToolById, getToolInitStates, getWatchedProjectDir, getWatcherRuntimeStatus, initWatcherPool, isGlobPattern, isHostedAppVersionManifest, isHostedBackendHealthResponse, isTerminalRendererEngine, isToolConfigured, isWatcherPoolInitialized, normalizeHostedAppBaseUrl, parseCliCommand, reactiveExists, reactiveReadDir, reactiveReadFile, reactiveStat, resolveHostedAppBaseUrl, resolveHostedChannelForVersion, sniffGlobalCli, toOpsxDisplayPath };
+export { type AIToolOption, AI_TOOLS, type ApplyInstructions, ApplyInstructionsSchema, type ApplyTask, ApplyTaskSchema, type ArchiveMeta, type ArtifactInstructions, ArtifactInstructionsSchema, type ArtifactStatus, ArtifactStatusSchema, CODE_EDITOR_THEME_VALUES, type Change, type ChangeFile, ChangeFileSchema, type ChangeMeta, ChangeSchema, type ChangeStatus, ChangeStatusSchema, CliExecutor, type CliResult, type CliRunnerAttempt, type CliSniffResult, type CliStreamEvent, type CodeEditorTheme, CodeEditorThemeSchema, ConfigManager, DASHBOARD_METRIC_KEYS, DEFAULT_CONFIG, type DashboardCardAvailability, type DashboardConfig, DashboardConfigSchema, type DashboardGitCommitEntry, type DashboardGitDiffStats, type DashboardGitEntry, type DashboardGitSnapshot, type DashboardGitUncommittedEntry, type DashboardGitWorktree, type DashboardMetricKey, type DashboardOverview, type DashboardSummary, type DashboardTrendKind, type DashboardTrendMeta, type DashboardTrendPoint, type DashboardTriColorTrendPoint, type Delta, type DeltaOperation, DeltaOperationType, DeltaSchema, type DeltaSpec, DeltaSpecSchema, type DependencyInfo, DependencyInfoSchema, type ExportSnapshot, type FileChangeEvent, type FileChangeType, type GitEntriesPage, type GitEntryCursor, type GitEntryDetail, type GitEntryFileDiff, type GitEntryFilePatch, type GitEntryFileSource, type GitEntryFileSummary, type GitEntryPatch, type GitEntrySelector, type GitEntryShell, type GitFileChangeType, type GitPatchFile, type GitPatchState, type GitWorktreeHandoff, type GitWorktreeOverview, type GitWorktreeSummary, type HostedAppChannelKind, type HostedAppChannelManifest, type HostedAppCompatibilityEntry, type HostedAppVersionManifest, type HostedBackendHealthResponse, MarkdownParser, OFFICIAL_APP_BASE_URL, OpenSpecAdapter, type OpenSpecUIConfig, OpenSpecUIConfigSchema, type OpenSpecUIConfigUpdate, OpenSpecWatcher, OpsxKernel, type PathCallback, ProjectWatcher, type ProjectWatcherReinitializeReason, type ProjectWatcherRuntimeStatus, PtyAttachMessageSchema, PtyBufferResponseSchema, type PtyClientMessage, PtyClientMessageSchema, PtyCloseMessageSchema, PtyCreateMessageSchema, PtyCreatedResponseSchema, PtyErrorCodeSchema, PtyErrorResponseSchema, PtyExitResponseSchema, PtyInputMessageSchema, PtyListMessageSchema, PtyListResponseSchema, PtyOutputResponseSchema, type PtyPlatform, PtyPlatformSchema, PtyResizeMessageSchema, type PtyServerMessage, PtyServerMessageSchema, type PtySessionInfo, PtyTitleResponseSchema, ReactiveContext, ReactiveState, type ReactiveStateOptions, type Requirement, RequirementSchema, type ResolvedCliRunner, type SchemaArtifact, SchemaArtifactSchema, type SchemaDetail, SchemaDetailSchema, type SchemaInfo, SchemaInfoSchema, type SchemaResolution, SchemaResolutionSchema, type Spec, type SpecMeta, SpecSchema, TOOL_WORKFLOW_TO_SKILL_DIR, type Task, TaskSchema, type TemplateContentMap, type TemplatesMap, TemplatesSchema, type TerminalConfig, TerminalConfigSchema, type TerminalRendererEngine, TerminalRendererEngineSchema, type ToolConfig, type ToolInitDelivery, type ToolInitState, type ToolInitStatus, type ToolWorkflowId, VIRTUAL_PROJECT_DIRNAME, type ValidationIssue, type ValidationResult, Validator, type WatchEvent, type WatchEventType, type WatcherRuntimeStatus, acquireWatcher, buildCliRunnerCandidates, buildHostedLaunchUrl, buildHostedVersionManifestUrl, clearCache, closeAllProjectWatchers, closeAllWatchers, contextStorage, createCleanCliEnv, createFileChangeObservable, getActiveWatcherCount, getAllToolIds, getAllTools, getAvailableToolIds, getAvailableTools, getCacheSize, getConfiguredTools, getDefaultCliCommand, getDefaultCliCommandString, getDetectedProjectTools, getProjectWatcher, getToolById, getToolInitStates, getWatchedProjectDir, getWatcherRuntimeStatus, initWatcherPool, isGlobPattern, isHostedAppVersionManifest, isHostedBackendHealthResponse, isTerminalRendererEngine, isToolConfigured, isWatcherPoolInitialized, normalizeHostedAppBaseUrl, parseCliCommand, reactiveExists, reactiveReadDir, reactiveReadFile, reactiveStat, resolveHostedAppBaseUrl, resolveHostedChannelForVersion, sniffGlobalCli, toOpsxDisplayPath };

package/dist/index.mjs

@@ -9,7 +9,7 @@ import { existsSync, lstatSync, realpathSync } from "node:fs";
 import { z } from "zod";
 import { EventEmitter } from "events";
 import { watch } from "fs";
-import { exec, spawn } from "child_process";
+import { exec, execFile, spawn } from "child_process";
 import { promisify } from "util";
 import { homedir } from "node:os";
 import { parse } from "yaml";
@@ -1922,6 +1922,7 @@ function createFileChangeObservable(watcher) {
 //#endregion
 //#region src/config.ts
 const execAsync = promisify(exec);
+const execFileAsync = promisify(execFile);
 const CLI_PROBE_TIMEOUT_MS = 2e4;
 const THEME_VALUES = [
 	"light",
@@ -2084,6 +2085,53 @@ function commandToString(commandParts) {
 	};
 	return commandParts.map(formatToken).join(" ").trim();
 }
+function isBareExecutableCommand(command) {
+	if (!command) return false;
+	if (command === "." || command === "..") return false;
+	return !/[\\/]/.test(command);
+}
+function quotePosixShellArg(value) {
+	return `'${value.replace(/'/g, `'\\''`)}'`;
+}
+async function resolveShellExecutablePath(command, cwd, env) {
+	if (!isBareExecutableCommand(command)) return null;
+	try {
+		if (process.platform === "win32") {
+			const { stdout: stdout$1 } = await execFileAsync("where", [command], {
+				cwd,
+				env,
+				encoding: "utf8",
+				timeout: 5e3
+			});
+			return stdout$1.split(/\r?\n/).map((line) => line.trim()).find((line) => line.length > 0) || null;
+		}
+		const { stdout } = await execFileAsync(env.SHELL || process.env.SHELL || "/bin/sh", ["-lc", `command -v -- ${quotePosixShellArg(command)}`], {
+			cwd,
+			env,
+			encoding: "utf8",
+			timeout: 5e3
+		});
+		return stdout.split("\n").map((line) => line.trim()).find((line) => line.startsWith("/")) || null;
+	} catch {
+		return null;
+	}
+}
+async function expandCliRunnerCandidates(candidates, cwd, env) {
+	const expanded = [];
+	for (const candidate of candidates) {
+		const [command, ...rest] = candidate.commandParts;
+		if ((candidate.id === "openspec" || candidate.id === "configured" && command.trim().toLowerCase() === "openspec") && command) {
+			const shellResolved = await resolveShellExecutablePath(command, cwd, env);
+			if (shellResolved && shellResolved !== command) expanded.push({
+				...candidate,
+				source: `${candidate.source} (shell)`,
+				commandParts: [shellResolved, ...rest]
+			});
+		}
+		expanded.push(candidate);
+	}
+	return expanded;
+}
 function getRunnerPriorityFromUserAgent(userAgent) {
 	if (!userAgent) return null;
 	if (userAgent.startsWith("bun")) return "bunx";
@@ -2189,8 +2237,9 @@ async function probeCliRunner(candidate, cwd, env) {
 	});
 }
 async function resolveCliRunner(candidates, cwd, env) {
+	const expandedCandidates = await expandCliRunnerCandidates(candidates, cwd, env);
 	const attempts = [];
-	for (const candidate of candidates) {
+	for (const candidate of expandedCandidates) {
 		const attempt = await probeCliRunner(candidate, cwd, env);
 		attempts.push(attempt);
 		if (attempt.success) return {
@@ -2243,7 +2292,13 @@ async function fetchLatestVersion() {
 * 每次调用都会重新检测，不使用缓存。
 */
 async function sniffGlobalCli() {
-	const [localResult, latestVersion] = await Promise.all([execAsync("openspec --version", { timeout: 1e4 }).catch((err) => ({ error: err })), fetchLatestVersion()]);
+	const env = createCleanCliEnv();
+	const resolvedCommand = await resolveShellExecutablePath("openspec", process.cwd(), env) ?? "openspec";
+	const [localResult, latestVersion] = await Promise.all([execFileAsync(resolvedCommand, ["--version"], {
+		env,
+		timeout: 1e4,
+		encoding: "utf8"
+	}).catch((err) => ({ error: err })), fetchLatestVersion()]);
 	if ("error" in localResult) {
 		const error = localResult.error instanceof Error ? localResult.error.message : String(localResult.error);
 		if (error.includes("not found") || error.includes("ENOENT") || error.includes("not recognized")) return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openspecui/core",
-  "version": "2.1.7",
+  "version": "2.2.0",
   "description": "Core OpenSpec adapter and parser",
   "type": "module",
   "main": "./dist/index.mjs",