@jingyi0605/codingns 0.7.3 → 0.8.0

package/dist/server/modules/office/office-service.js

@@ -0,0 +1,359 @@
+import fs from "node:fs";
+import path from "node:path";
+import { AppError } from "../../shared/errors/app-error.js";
+import { createId } from "../../shared/utils/id.js";
+import { nowIso } from "../../shared/utils/time.js";
+export class OfficeService {
+    taskRepository;
+    taskStepRepository;
+    artifactRepository;
+    approvalRepository;
+    receiptRepository;
+    connectorRepository;
+    auditEventRepository;
+    rollbackRecordRepository;
+    databasePath;
+    constructor(taskRepository, taskStepRepository, artifactRepository, approvalRepository, receiptRepository, connectorRepository, auditEventRepository, rollbackRecordRepository, databasePath) {
+        this.taskRepository = taskRepository;
+        this.taskStepRepository = taskStepRepository;
+        this.artifactRepository = artifactRepository;
+        this.approvalRepository = approvalRepository;
+        this.receiptRepository = receiptRepository;
+        this.connectorRepository = connectorRepository;
+        this.auditEventRepository = auditEventRepository;
+        this.rollbackRecordRepository = rollbackRecordRepository;
+        this.databasePath = databasePath;
+    }
+    listTasks(filters) {
+        return this.taskRepository.list(filters);
+    }
+    getTaskDetail(taskId, userId) {
+        const task = this.requireOwnedTask(taskId, userId);
+        return {
+            task,
+            steps: this.taskStepRepository.listByTaskId(task.id),
+            artifacts: this.artifactRepository.listByTaskId(task.id),
+            approvals: this.approvalRepository.listByTaskId(task.id),
+            receipts: this.receiptRepository.listByTaskId(task.id),
+            audits: this.auditEventRepository.listByTaskId(task.id)
+        };
+    }
+    getArtifact(artifactId, userId) {
+        const artifact = this.artifactRepository.findById(artifactId.trim());
+        if (!artifact) {
+            throw new AppError({
+                statusCode: 404,
+                errorCode: "OFFICE_ARTIFACT_NOT_FOUND",
+                detail: "未找到对应办公产物"
+            });
+        }
+        this.requireOwnedTask(artifact.taskId, userId);
+        return artifact;
+    }
+    getArtifactFile(taskId, fileName, userId) {
+        const task = this.requireOwnedTask(taskId.trim(), userId);
+        const normalizedFileName = path.basename(fileName.trim());
+        if (!normalizedFileName) {
+            throw new AppError({
+                statusCode: 400,
+                errorCode: "OFFICE_ARTIFACT_FILE_INVALID",
+                detail: "办公产物文件名不能为空"
+            });
+        }
+        if (!this.databasePath) {
+            throw new AppError({
+                statusCode: 500,
+                errorCode: "OFFICE_ARTIFACT_FILE_UNAVAILABLE",
+                detail: "当前环境未配置办公产物根目录"
+            });
+        }
+        const taskArtifactDir = path.resolve(path.dirname(this.databasePath), "office-artifacts", task.id);
+        const absolutePath = path.resolve(taskArtifactDir, normalizedFileName);
+        if (!absolutePath.startsWith(`${taskArtifactDir}${path.sep}`) && absolutePath !== path.join(taskArtifactDir, normalizedFileName)) {
+            throw new AppError({
+                statusCode: 400,
+                errorCode: "OFFICE_ARTIFACT_FILE_INVALID",
+                detail: "办公产物文件路径非法"
+            });
+        }
+        try {
+            const stats = fs.statSync(absolutePath);
+            if (!stats.isFile()) {
+                throw new Error("not_file");
+            }
+        }
+        catch {
+            throw new AppError({
+                statusCode: 404,
+                errorCode: "OFFICE_ARTIFACT_FILE_NOT_FOUND",
+                detail: "未找到对应办公产物文件"
+            });
+        }
+        return {
+            absolutePath,
+            fileName: normalizedFileName,
+            contentType: resolveOfficeArtifactFileContentType(normalizedFileName)
+        };
+    }
+    createTask(input) {
+        const connector = this.requireActiveConnector(input.connectorId);
+        const title = input.title.trim();
+        if (!title) {
+            throw new AppError({
+                statusCode: 400,
+                errorCode: "INVALID_INPUT",
+                detail: "任务标题不能为空",
+                field: "title"
+            });
+        }
+        const idempotencyKey = normalizeNullableText(input.idempotencyKey);
+        if (idempotencyKey) {
+            const existing = this.taskRepository.findActiveByIdempotencyKey(input.userId, idempotencyKey);
+            if (existing) {
+                return {
+                    task: existing,
+                    requiresApproval: existing.status === "pending_approval"
+                };
+            }
+        }
+        const timestamp = nowIso();
+        const riskLevel = input.riskLevel ?? "low";
+        const requiresApproval = riskLevel === "high";
+        const task = {
+            id: createId(),
+            userId: input.userId,
+            workspaceId: input.workspaceId ?? null,
+            taskType: input.taskType,
+            title,
+            description: normalizeNullableText(input.description),
+            connectorId: connector.id,
+            targetRefKind: normalizeNullableText(input.targetRefKind),
+            targetRefId: normalizeNullableText(input.targetRefId),
+            inputJson: JSON.stringify(input.input ?? {}),
+            status: requiresApproval ? "pending_approval" : "ready",
+            riskLevel,
+            approvalPolicyId: normalizeNullableText(input.approvalPolicyId),
+            currentStepId: null,
+            idempotencyKey,
+            startedAt: null,
+            finishedAt: null,
+            createdAt: timestamp,
+            updatedAt: timestamp
+        };
+        this.taskRepository.create(task);
+        this.auditEventRepository.create({
+            id: createId(),
+            taskId: task.id,
+            stepId: null,
+            eventKind: "task_created",
+            actorKind: "user",
+            actorId: input.userId,
+            summary: `创建 ${task.taskType} 任务`,
+            payloadJson: JSON.stringify({
+                connectorKey: connector.connectorKey,
+                riskLevel: task.riskLevel
+            }),
+            createdAt: timestamp
+        });
+        if (requiresApproval) {
+            this.approvalRepository.create({
+                id: createId(),
+                taskId: task.id,
+                stepId: null,
+                policyId: task.approvalPolicyId ?? "default_high_risk",
+                status: "pending",
+                approverUserId: null,
+                decisionNote: null,
+                decidedAt: null,
+                createdAt: timestamp,
+                updatedAt: timestamp
+            });
+        }
+        return {
+            task,
+            requiresApproval
+        };
+    }
+    cancelTask(taskId, userId) {
+        const current = this.requireOwnedTask(taskId, userId);
+        if (!isMutableTaskStatus(current.status)) {
+            throw new AppError({
+                statusCode: 409,
+                errorCode: "OFFICE_TASK_CANCEL_NOT_ALLOWED",
+                detail: "当前任务状态不允许取消"
+            });
+        }
+        const next = {
+            ...current,
+            status: "cancelled",
+            finishedAt: current.finishedAt ?? nowIso(),
+            updatedAt: nowIso()
+        };
+        this.taskRepository.update(next);
+        this.auditEventRepository.create({
+            id: createId(),
+            taskId: next.id,
+            stepId: null,
+            eventKind: "task_cancelled",
+            actorKind: "user",
+            actorId: userId,
+            summary: "用户取消任务",
+            payloadJson: null,
+            createdAt: next.updatedAt
+        });
+        return next;
+    }
+    retryTask(taskId, userId) {
+        const current = this.requireOwnedTask(taskId, userId);
+        if (current.status !== "failed" && current.status !== "cancelled") {
+            throw new AppError({
+                statusCode: 409,
+                errorCode: "OFFICE_TASK_RETRY_NOT_ALLOWED",
+                detail: "只有失败或已取消的任务允许重试"
+            });
+        }
+        const nextStatus = current.riskLevel === "high" ? "pending_approval" : "ready";
+        const next = {
+            ...current,
+            status: nextStatus,
+            currentStepId: null,
+            startedAt: null,
+            finishedAt: null,
+            updatedAt: nowIso()
+        };
+        this.taskRepository.update(next);
+        this.auditEventRepository.create({
+            id: createId(),
+            taskId: next.id,
+            stepId: null,
+            eventKind: "task_updated",
+            actorKind: "user",
+            actorId: userId,
+            summary: "用户重试任务",
+            payloadJson: JSON.stringify({ nextStatus }),
+            createdAt: next.updatedAt
+        });
+        return next;
+    }
+    listConnectors(kind) {
+        return this.connectorRepository.list(kind);
+    }
+    replyApproval(input) {
+        const current = this.approvalRepository.findById(input.approvalId.trim());
+        if (!current) {
+            throw new AppError({
+                statusCode: 404,
+                errorCode: "OFFICE_APPROVAL_NOT_FOUND",
+                detail: "未找到对应审批记录"
+            });
+        }
+        if (current.status !== "pending") {
+            throw new AppError({
+                statusCode: 409,
+                errorCode: "OFFICE_APPROVAL_ALREADY_DECIDED",
+                detail: "该审批已经处理过"
+            });
+        }
+        const timestamp = nowIso();
+        const next = {
+            ...current,
+            status: input.status,
+            approverUserId: input.userId,
+            decisionNote: normalizeNullableText(input.decisionNote),
+            decidedAt: timestamp,
+            updatedAt: timestamp
+        };
+        this.approvalRepository.update(next);
+        const task = this.taskRepository.findById(current.taskId);
+        if (task) {
+            const taskNext = {
+                ...task,
+                status: input.status === "approved" ? "ready" : "cancelled",
+                finishedAt: input.status === "approved" ? task.finishedAt : timestamp,
+                updatedAt: timestamp
+            };
+            this.taskRepository.update(taskNext);
+            this.auditEventRepository.create({
+                id: createId(),
+                taskId: task.id,
+                stepId: current.stepId,
+                eventKind: input.status === "approved" ? "task_approved" : "task_rejected",
+                actorKind: "user",
+                actorId: input.userId,
+                summary: input.status === "approved" ? "审批通过" : "审批拒绝",
+                payloadJson: next.decisionNote ? JSON.stringify({ decisionNote: next.decisionNote }) : null,
+                createdAt: timestamp
+            });
+        }
+        return next;
+    }
+    requireOwnedTask(taskId, userId) {
+        const task = this.taskRepository.findById(taskId.trim());
+        if (!task || task.userId !== userId) {
+            throw new AppError({
+                statusCode: 404,
+                errorCode: "OFFICE_TASK_NOT_FOUND",
+                detail: "未找到对应办公任务"
+            });
+        }
+        return task;
+    }
+    requireActiveConnector(connectorIdOrKey) {
+        const connectorRef = connectorIdOrKey.trim();
+        const connector = this.connectorRepository.findById(connectorRef)
+            ?? this.connectorRepository.findByKey(connectorRef);
+        if (!connector) {
+            throw new AppError({
+                statusCode: 404,
+                errorCode: "OFFICE_CONNECTOR_NOT_FOUND",
+                detail: "未找到对应连接器",
+                field: "connectorId"
+            });
+        }
+        if (connector.status !== "active") {
+            throw new AppError({
+                statusCode: 409,
+                errorCode: "OFFICE_CONNECTOR_DISABLED",
+                detail: "当前连接器不可用",
+                field: "connectorId"
+            });
+        }
+        return connector;
+    }
+}
+function resolveOfficeArtifactFileContentType(fileName) {
+    const ext = path.extname(fileName).toLowerCase();
+    switch (ext) {
+        case ".png":
+            return "image/png";
+        case ".jpg":
+        case ".jpeg":
+            return "image/jpeg";
+        case ".webp":
+            return "image/webp";
+        case ".gif":
+            return "image/gif";
+        case ".pdf":
+            return "application/pdf";
+        case ".html":
+            return "text/html; charset=utf-8";
+        case ".json":
+            return "application/json; charset=utf-8";
+        case ".txt":
+        case ".md":
+            return "text/plain; charset=utf-8";
+        default:
+            return "application/octet-stream";
+    }
+}
+function normalizeNullableText(value) {
+    if (typeof value !== "string") {
+        return null;
+    }
+    const trimmed = value.trim();
+    return trimmed.length > 0 ? trimmed : null;
+}
+function isMutableTaskStatus(status) {
+    return ["draft", "pending_approval", "ready", "running", "paused", "waiting_external"].includes(status);
+}
+//# sourceMappingURL=office-service.js.map

package/dist/server/modules/office/office-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"office-service.js","sourceRoot":"","sources":["../../../../src/modules/office/office-service.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/opencli/opencli-bridge-skill-service.js

@@ -7,6 +7,7 @@ const SUPPORTED_SKILL_PROVIDERS = new Set([
     "legna-code"
 ]);
 const MAX_VISIBLE_COMMANDS = 80;
+const OPENCLI_BRIDGE_SKILL_DESCRIPTION = "Use when the user needs website or platform data through the OpenCLI commands enabled in this CodingNS managed session. Always treat OpenCLI as a managed runtime: check the enabled catalog first, only call enabled commands, and remember browser-dependent commands may still fail in the current environment.";
 export class OpenCliBridgeSkillService {
     providerRepository;
     catalogEntryRepository;
@@ -47,11 +48,14 @@ export class OpenCliBridgeSkillService {
 }
 function buildSkillMarkdown(entries) {
     const siteSummaries = buildSiteSummaries(entries);
-    const visibleCommands = entries.slice(0, MAX_VISIBLE_COMMANDS);
-    const hiddenCommandCount = entries.length - visibleCommands.length;
+    const publicVisibleCommands = entries.filter((entry) => !entry.browser).slice(0, MAX_VISIBLE_COMMANDS);
+    const hiddenPublicCommandCount = entries.filter((entry) => !entry.browser).length - publicVisibleCommands.length;
+    const browserDependentCommands = entries.filter((entry) => entry.browser);
+    const browserDependentPreview = browserDependentCommands.slice(0, 12);
+    const hiddenBrowserCommandCount = browserDependentCommands.length - browserDependentPreview.length;
     return `---
 name: codingns-opencli
-description: Use when the user needs website or platform data through the OpenCLI commands enabled in this CodingNS managed session. Always treat OpenCLI as a managed runtime: check the enabled catalog first, only call enabled commands, and remember browser-dependent commands may still fail in the current environment.
+description: ${JSON.stringify(OPENCLI_BRIDGE_SKILL_DESCRIPTION)}
 ---
 
 # CodingNS OpenCLI
@@ -67,16 +71,20 @@ description: Use when the user needs website or platform data through the OpenCL
 - 不要假设 OpenCLI 全目录都可用，只认当前 skill 里列出的启用站点和启用命令。
 - 如果不确定当前 runtime 里到底有哪些命令，先执行 \`opencli list -f json\`。
 - 如果某个命令标记为“依赖浏览器”，那只表示目录里存在，不表示当前环境一定能跑通。
+- browser-dependent 的 OpenCLI 命令不是通用浏览器自动化入口，不要把它当成 \`office.browser.*\` 的替代品。
+- 只要任务涉及登录态、个人账户、订单、购物车、私有页面、验证码、企业后台、表单提交、下载文件、点击页面控件、复用人工已登录 Chrome/Edge，一律不要直接调用 browser-dependent 的 OpenCLI 站点命令。
+- 上面这类真实站点操作，在工作区会话里必须优先走 \`office.browser.*\`；如果要真实浏览器调试，应显式传 \`executionBackend=opencli_bridge\`。
 - 如果 \`opencli list -f json\` 或具体命令报不存在、桥接缺失、浏览器错误，就直接按事实说明，不要编造结果。
 - 当前 skill 只负责 OpenCLI 桥接，不负责替代普通 shell 推理。
 
 ## 默认工作流
 
-1. 用户要抓站点、平台、榜单、趋势、帖子、公开页面数据时，优先判断是不是适合走 OpenCLI。
+1. 用户要抓公开站点、公开页面、公开榜单、公开帖子、公开趋势数据时，优先判断是不是适合走 OpenCLI。
 2. 不确定命令名或当前可用目录时，先跑 \`opencli list -f json\`。
-3. 只从当前启用命令里挑一个最贴切的 \`site/name\` 去执行。
-4. 如果命令依赖浏览器，先提醒它可能失败；如果用户仍要继续，再执行一次真实命令，不要伪造成功。
-5. 失败时先回传真实错误，再决定是否换命令或回退别的方案。
+3. 如果是登录、账户、后台、下单、订单、验证码、页面交互或真实浏览器操作，不要选 OpenCLI，直接回到 \`office.browser.*\`。
+4. 只从当前启用命令里挑一个最贴切的 \`site/name\` 去执行。
+5. 如果命令依赖浏览器，先提醒它可能失败；如果用户仍要继续，再执行一次真实命令，不要伪造成功。
+6. 失败时先回传真实错误，再决定是否换命令或回退别的方案。
 
 ## 当前启用站点
 
@@ -84,25 +92,41 @@ ${siteSummaries.length > 0
         ? siteSummaries.map((summary) => `- ${summary}`).join("\n")
         : "- 当前没有启用任何站点"}
 
-## 当前启用命令
+## 当前默认可见命令
 
-${visibleCommands.length > 0
-        ? visibleCommands.map((entry) => {
+这里只列默认建议直接调用的公开数据命令。browser-dependent 命令即使存在，也不应该在真实站点任务里替代 \`office.browser.*\`。
+
+${publicVisibleCommands.length > 0
+        ? publicVisibleCommands.map((entry) => {
             const suffix = entry.browser ? "依赖浏览器" : "可直接运行";
             const description = entry.description.trim() || "未写说明";
             return `- \`${entry.commandId}\`：${description}；${suffix}`;
         }).join("\n")
-        : "- 当前没有启用任何命令"}
-${hiddenCommandCount > 0 ? `\n- 其余还有 ${hiddenCommandCount} 个启用命令，执行前可用 \`opencli list -f json\` 再确认。` : ""}
+        : "- 当前没有默认建议直接调用的公开命令"}
+${hiddenPublicCommandCount > 0 ? `\n- 其余还有 ${hiddenPublicCommandCount} 个公开命令未展开，执行前可用 \`opencli list -f json\` 再确认。` : ""}
+
+## browser-dependent 命令
+
+下面这些命令只是说明 runtime 目录里存在对应桥接命令，不代表应该把它们当成正式浏览器任务入口。
+
+${browserDependentPreview.length > 0
+        ? browserDependentPreview.map((entry) => {
+            const description = entry.description.trim() || "未写说明";
+            return `- \`${entry.commandId}\`：${description}；只可用于受控的 OpenCLI 抓取，不可替代 \`office.browser.*\``;
+        }).join("\n")
+        : "- 当前没有 browser-dependent 命令"}
+${hiddenBrowserCommandCount > 0 ? `\n- 其余还有 ${hiddenBrowserCommandCount} 个 browser-dependent 命令未展开；如确实需要查看目录，只能用 \`opencli list -f json\` 自查，不能默认把它们当成真实站点任务入口。` : ""}
 `;
 }
 function buildOpenAiAgentPrompt() {
     return [
         "language: zh-CN",
         "default_prompt: |",
-        "  当用户要站点、平台、榜单、帖子、趋势或公开页面数据时，优先检查 $codingns-opencli。",
+        "  当用户要公开站点、公开页面、公开榜单、公开帖子或公开趋势数据时，优先检查 $codingns-opencli。",
         "  先看 skill 里列出的启用命令；如果不确定当前 runtime 目录，再执行 `opencli list -f json`。",
-        "  只能调用当前启用的 site/name，不要假设全局 opencli 目录都可用。"
+        "  只能调用当前启用的 site/name，不要假设全局 opencli 目录都可用。",
+        "  不要把 browser-dependent 的 OpenCLI 命令当成通用浏览器自动化入口。",
+        "  只要任务涉及登录、验证码、个人账户、订单、私有页面、企业后台、表单提交、下载文件或复用人工已登录浏览器，一律回到 office.browser.*；如果要真实浏览器调试，显式传 executionBackend=opencli_bridge。"
     ].join("\n");
 }
 function buildSiteSummaries(entries) {

package/dist/server/modules/opencli/opencli-bridge-skill-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"opencli-bridge-skill-service.js","sourceRoot":"","sources":["../../../../src/modules/opencli/opencli-bridge-skill-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"opencli-bridge-skill-service.js","sourceRoot":"","sources":["../../../../src/modules/opencli/opencli-bridge-skill-service.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/opencli/opencli-install-discovery.d.ts

@@ -14,10 +14,14 @@ export interface OpenCliInstallDiscoveryResult {
 export interface OpenCliInstallDiscoveryOptions {
     env?: NodeJS.ProcessEnv;
     catalogRootCandidates?: readonly string[];
+    packagedInstallRootCandidates?: readonly string[];
 }
 export declare class OpenCliInstallDiscovery {
     private readonly env;
     private readonly catalogRootCandidates;
+    private readonly packagedInstallRootCandidates;
+    private readonly hasExplicitPackagedInstallCandidates;
     constructor(options?: OpenCliInstallDiscoveryOptions);
     discover(): OpenCliInstallDiscoveryResult;
+    private resolvePackagedInstall;
 }

package/dist/server/modules/opencli/opencli-install-discovery.js

@@ -4,11 +4,21 @@ const OPENCLI_PACKAGE_NAME = "@jackwener/opencli";
 export class OpenCliInstallDiscovery {
     env;
     catalogRootCandidates;
+    packagedInstallRootCandidates;
+    hasExplicitPackagedInstallCandidates;
     constructor(options = {}) {
         this.env = options.env ?? process.env;
         this.catalogRootCandidates = options.catalogRootCandidates ?? [];
+        this.hasExplicitPackagedInstallCandidates = Array.isArray(options.packagedInstallRootCandidates);
+        this.packagedInstallRootCandidates = options.packagedInstallRootCandidates ?? resolvePackagedOpenCliRootCandidates();
     }
     discover() {
+        if (this.hasExplicitPackagedInstallCandidates) {
+            const packagedInstall = this.resolvePackagedInstall();
+            if (packagedInstall) {
+                return packagedInstall;
+            }
+        }
         const binaryPath = resolveExecutableFromPath("opencli", this.env.PATH ?? null);
         if (binaryPath) {
             const installRoot = findOpenCliRootForExecutable(binaryPath);
@@ -27,6 +37,12 @@ export class OpenCliInstallDiscovery {
                     : null
             };
         }
+        if (!this.hasExplicitPackagedInstallCandidates) {
+            const packagedInstall = this.resolvePackagedInstall();
+            if (packagedInstall) {
+                return packagedInstall;
+            }
+        }
         for (const candidateRoot of this.catalogRootCandidates) {
             const resolvedRoot = path.resolve(candidateRoot);
             const manifestPath = path.join(resolvedRoot, "cli-manifest.json");
@@ -53,6 +69,30 @@ export class OpenCliInstallDiscovery {
             manifestSource: null
         };
     }
+    resolvePackagedInstall() {
+        for (const candidateRoot of this.packagedInstallRootCandidates) {
+            const resolvedRoot = path.resolve(candidateRoot);
+            if (!looksLikeOpenCliRoot(resolvedRoot)) {
+                continue;
+            }
+            const binaryPath = resolveOpenCliBinaryFromInstallRoot(resolvedRoot);
+            const manifestPath = path.join(resolvedRoot, "cli-manifest.json");
+            return {
+                installState: "installed",
+                binaryPath,
+                installPath: resolvedRoot,
+                version: readPackageVersion(resolvedRoot),
+                manifestSource: fs.existsSync(manifestPath)
+                    ? {
+                        kind: "manifest",
+                        rootPath: resolvedRoot,
+                        manifestPath
+                    }
+                    : null
+            };
+        }
+        return null;
+    }
 }
 function resolveExecutableFromPath(binaryName, pathValue) {
     if (!pathValue) {
@@ -127,4 +167,58 @@ function readPackageVersion(rootPath) {
         return null;
     }
 }
+function resolvePackagedOpenCliRootCandidates() {
+    const candidates = [
+        path.resolve(import.meta.dirname, "../../../../../packages/codingns/node_modules/@jackwener/opencli"),
+        path.resolve(import.meta.dirname, "../../../../../node_modules/@jackwener/opencli")
+    ];
+    return candidates.filter((candidate, index, values) => values.indexOf(candidate) === index);
+}
+function resolveOpenCliBinaryFromInstallRoot(rootPath) {
+    const packageBinCandidates = readPackageBinCandidates(rootPath);
+    const fallbackCandidates = process.platform === "win32"
+        ? [
+            path.join(rootPath, "bin", "opencli.cmd"),
+            path.join(rootPath, "bin", "opencli.exe"),
+            path.join(rootPath, "bin", "opencli.bat"),
+            path.join(rootPath, "node_modules", ".bin", "opencli.cmd"),
+            path.join(rootPath, "node_modules", ".bin", "opencli.exe"),
+            path.join(rootPath, "node_modules", ".bin", "opencli.bat")
+        ]
+        : [
+            path.join(rootPath, "bin", "opencli"),
+            path.join(rootPath, "node_modules", ".bin", "opencli")
+        ];
+    const candidates = [...packageBinCandidates, ...fallbackCandidates]
+        .filter((candidate, index, values) => values.indexOf(candidate) === index);
+    for (const candidate of candidates) {
+        if (isExecutable(candidate)) {
+            return candidate;
+        }
+    }
+    return null;
+}
+function readPackageBinCandidates(rootPath) {
+    const packageJsonPath = path.join(rootPath, "package.json");
+    if (!fs.existsSync(packageJsonPath)) {
+        return [];
+    }
+    try {
+        const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+        const packageBin = packageJson.bin;
+        if (typeof packageBin === "string" && packageBin.trim().length > 0) {
+            return [path.resolve(rootPath, packageBin.trim())];
+        }
+        if (typeof packageBin === "object" && packageBin !== null) {
+            const opencliBin = packageBin.opencli;
+            if (typeof opencliBin === "string" && opencliBin.trim().length > 0) {
+                return [path.resolve(rootPath, opencliBin.trim())];
+            }
+        }
+    }
+    catch {
+        return [];
+    }
+    return [];
+}
 //# sourceMappingURL=opencli-install-discovery.js.map