superun-ai-cli 0.1.7 → 0.1.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.en.md +4 -0
- package/README.md +4 -0
- package/dist/config/runtime-config.d.ts +2 -0
- package/dist/config/runtime-config.js +8 -0
- package/dist/config/runtime-config.js.map +1 -1
- package/dist/contracts/cli-output.d.ts +2 -12
- package/dist/conversation/development-snapshot.d.ts +3 -7
- package/dist/conversation/development-snapshot.js +4 -11
- package/dist/conversation/development-snapshot.js.map +1 -1
- package/dist/conversation/next-actions.js +6 -19
- package/dist/conversation/next-actions.js.map +1 -1
- package/dist/interactions/parsers/style-selection.js +2 -5
- package/dist/interactions/parsers/style-selection.js.map +1 -1
- package/dist/runtime.d.ts +1 -1
- package/dist/runtime.js +13 -40
- package/dist/runtime.js.map +1 -1
- package/dist/update/npm-registry.d.ts +13 -0
- package/dist/update/npm-registry.js +89 -0
- package/dist/update/npm-registry.js.map +1 -0
- package/dist/update/version-gate.d.ts +1 -1
- package/dist/update/version-gate.js +15 -47
- package/dist/update/version-gate.js.map +1 -1
- package/package.json +1 -1
package/README.en.md
CHANGED
|
@@ -217,6 +217,8 @@ Style generation defaults to two candidates and supports one to four. Use the re
|
|
|
217
217
|
|
|
218
218
|
Style waiting returns progress as soon as one candidate succeeds and its preview page is ready, while the batch remains `RUNNING`. Each candidate exposes `previewUrl`, the same interactive page used by Glow's branch preview. Screenshot URLs are not returned, and screenshot generation does not delay readiness. Show that candidate and its page link immediately, then follow `QUERY_STYLES` to keep checking the remaining candidates. For example: “Style B is ready; waiting for style A.” Labels A/B/C/D correspond to the original `index` 0/1/2/3, regardless of completion order. Announce each `choiceId` only once and wait for the user's selection after the batch finishes.
|
|
219
219
|
|
|
220
|
+
After development completes, the preview link is returned in `development.previewUrl` as `https://id--<sessionId>.<hosting-domain>`, matching Glow's stable development-mainline address and updating with mainline builds. Development no longer looks up or waits for snapshots. Style candidates and saved demo versions retain their own snapshot pages, while launch operations return the published domain.
|
|
221
|
+
|
|
220
222
|
After the user selects a style, `chat style select` waits for its demo, completes the demo transition and preserves the version internally, then generates the development plan. Show only that the selected style is being used to prepare the plan, without demo-stage prompts or additional questions. Keep the existing plan content and confirmation/adjustment guidance unchanged; the feature-selection step follows plan approval. After `--no-wait` or a local timeout, follow `CONTINUE_STYLE_PLANNING` with `chat wait` to check the current state and resume the transition. `chat state` remains read-only, and existing projects can still use `chat demo` and `chat develop`.
|
|
221
223
|
|
|
222
224
|
After the user explicitly asks to launch the site, use `chat publish status <sessionId> --for-launch` to get the latest pending version from the publishing panel. Show its `changeLog` unchanged, then follow the returned publishing command without a second confirmation. For a deployment already in progress, only track progress. If deployment is complete but the site is not public, finish the visibility step and return the public URL. `status` is always read-only; an ordinary status query does not grant publishing authorization.
|
|
@@ -265,6 +267,8 @@ Business commands write one JSON result to stdout. Diagnostics and update progre
|
|
|
265
267
|
|
|
266
268
|
The CLI checks npm's `latest` version before business commands. If it differs from the local version, the CLI installs that version and resumes the command. If an update or verification fails, the CLI stops; resolve the reported issue before retrying. Help, `version`, and `auth logout` work offline.
|
|
267
269
|
|
|
270
|
+
Version checks and installation both run through npm, inheriting its proxy and certificate configuration and retrying transient network failures. If the official Registry is unavailable, the CLI tries the user's configured Registry and uses the successful source for installation. Recovery does not print errors or installation logs. If all sources fail, `error.checks` provides reason codes without raw npm logs or credentials. The CLI does not disable certificate verification or skip the version check to allow business requests.
|
|
271
|
+
|
|
268
272
|
Run `superun-ai update` to sync with npm `latest` explicitly. Source installations use the same version check. Rebuild after changing the source; if the global command is not linked to that checkout, run `npm install -g .` again.
|
|
269
273
|
|
|
270
274
|
```bash
|
package/README.md
CHANGED
|
@@ -217,6 +217,8 @@ superun-ai chat publish visibility <sessionId> private
|
|
|
217
217
|
|
|
218
218
|
风格等待会在单个方案成功且预览页面就绪时提前返回进度,整批状态仍为 `RUNNING`。候选通过 `previewUrl` 返回与 Glow 分支预览相同的可交互页面,不返回截图链接,也不等待截图生成。调用方应立即提示该方案及页面链接,再按 `QUERY_STYLES` 继续查询剩余方案,例如“方案 B 已生成,继续等待方案 A”。方案 A/B/C/D 固定对应原始 `index` 0/1/2/3,同一 `choiceId` 只提示一次;全部结束后再等待用户选择。
|
|
219
219
|
|
|
220
|
+
研发完成后的“查看预览”使用 `development.previewUrl`,返回与 Glow 研发主线一致的稳定地址 `https://id--<sessionId>.<托管域名>`,随主线构建结果更新。研发主线不再查找或等待快照;风格候选和独立演示版本继续使用各自的快照页面。上线运营返回正式发布域名。
|
|
221
|
+
|
|
220
222
|
用户选择风格后,`chat style select` 默认内部完成演示就绪等待、演示状态衔接和版本保留,再生成研发规划。调用方只提示“已采用方案 B,正在生成研发规划,完成后请你确认”,不展示演示阶段的提示或额外询问。研发规划内容及“确认规划 / 调整功能”引导保持原样,确认规划后才生成供用户选择的开发功能清单。`--no-wait` 或等待超时返回时,按 `CONTINUE_STYLE_PLANNING` 继续执行 `chat wait`;它会核对当前状态后继续衔接。`chat state` 仍只读,旧项目仍可使用 `chat demo` 和 `chat develop`。
|
|
221
223
|
|
|
222
224
|
用户明确回复“上线运营”后,使用 `chat publish status <sessionId> --for-launch` 获取 Glow 发布面板的最新待发布版本,原样展示该版本的 `changeLog`,再按返回的命令直接发布,无需二次确认。发布中的版本只跟踪进度;部署后尚未公开的站点继续执行上线动作,完成后返回正式链接。`status` 始终只读,普通状态查询不会自动获得发布授权。
|
|
@@ -265,6 +267,8 @@ superun-ai chat publish visibility <sessionId> private
|
|
|
265
267
|
|
|
266
268
|
CLI 会在执行业务命令前检查 npm `latest` 版本,与本地版本不同时自动安装该版本并继续执行。更新或校验失败时会停止执行,请根据错误提示处理后重试。帮助、`version` 和 `auth logout` 可离线使用。
|
|
267
269
|
|
|
270
|
+
版本预检和安装统一通过 npm 执行,沿用 npm 的代理和证书配置,并自动重试短暂的网络故障。官方 Registry 不可用时,会尝试用户已配置的 Registry,安装沿用查询成功的源;恢复过程不输出报错或安装日志。所有源均失败时才返回错误,`error.checks` 包含各次检查的原因码,不包含原始 npm 日志或凭据。不会通过关闭证书校验或忽略版本检查来放行业务请求。
|
|
271
|
+
|
|
268
272
|
可以执行 `superun-ai update` 主动同步 npm `latest`。从源码安装也遵循相同的版本校验;修改源码后需要重新构建,如果全局命令不是链接到该目录,再执行 `npm install -g .`。
|
|
269
273
|
|
|
270
274
|
```bash
|
|
@@ -3,6 +3,8 @@ export type RuntimeConfig = {
|
|
|
3
3
|
locale: string;
|
|
4
4
|
timeoutMs: number;
|
|
5
5
|
};
|
|
6
|
+
/** 与 Glow 一致,按当前连接环境选择预览托管域名。 */
|
|
7
|
+
export declare function getSuperunHostingDomain(endpoint: string): string;
|
|
6
8
|
export declare function runtimeConfig(options: {
|
|
7
9
|
endpoint?: string;
|
|
8
10
|
locale?: string;
|
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
/** 本次命令的连接配置。@author xiuyu.yi */
|
|
2
2
|
import { DEFAULT_ENDPOINT } from './constants.js';
|
|
3
3
|
import { CliError } from '../output/exit-codes.js';
|
|
4
|
+
/** 与 Glow 一致,按当前连接环境选择预览托管域名。 */
|
|
5
|
+
export function getSuperunHostingDomain(endpoint) {
|
|
6
|
+
const hostname = new URL(endpoint).hostname;
|
|
7
|
+
const china = ['superun.com', 'suxiaoqiang.com'].some((domain) => hostname === domain || hostname.endsWith(`.${domain}`)) ||
|
|
8
|
+
['superun.pre.qima-inc.com', 'localhost', '127.0.0.1', '[::1]'].includes(hostname) ||
|
|
9
|
+
hostname.startsWith('172.18.');
|
|
10
|
+
return china ? 'superun.yun' : 'superun.app';
|
|
11
|
+
}
|
|
4
12
|
export function runtimeConfig(options) {
|
|
5
13
|
const endpoint = options.endpoint ?? process.env.SUPERUN_ENDPOINT ?? DEFAULT_ENDPOINT;
|
|
6
14
|
let url;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-config.js","sourceRoot":"","sources":["../../src/config/runtime-config.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAQnD,MAAM,UAAU,aAAa,CAAC,OAA+C;IAC3E,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,gBAAgB,CAAC;IACtF,IAAI,GAAQ,CAAC;IACb,IAAI,CAAC;QACH,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC1B,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,QAAQ,CAAC,kBAAkB,EAAE,4BAA4B,CAAC,CAAC;IACvE,CAAC;IACD,MAAM,QAAQ,GAAG,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC5E,IACE,CAAC,GAAG,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,QAAQ,KAAK,OAAO,IAAI,QAAQ,CAAC,CAAC;QACtE,GAAG,CAAC,QAAQ;QACZ,GAAG,CAAC,QAAQ;QACZ,GAAG,CAAC,MAAM;QACV,GAAG,CAAC,IAAI;QACR,GAAG,CAAC,QAAQ,KAAK,GAAG,EACpB,CAAC;QACD,MAAM,IAAI,QAAQ,CAAC,kBAAkB,EAAE,sCAAsC,CAAC,CAAC;IACjF,CAAC;IACD,OAAO;QACL,QAAQ,EAAE,GAAG,CAAC,MAAM;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,OAAO;QACjC,SAAS,EAAE,MAAM;KAClB,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"runtime-config.js","sourceRoot":"","sources":["../../src/config/runtime-config.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAQnD,iCAAiC;AACjC,MAAM,UAAU,uBAAuB,CAAC,QAAgB;IACtD,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC;IAC5C,MAAM,KAAK,GACT,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC,IAAI,CACrC,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,KAAK,MAAM,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,MAAM,EAAE,CAAC,CACnE;QACD,CAAC,0BAA0B,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAClF,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IACjC,OAAO,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAA+C;IAC3E,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,gBAAgB,CAAC;IACtF,IAAI,GAAQ,CAAC;IACb,IAAI,CAAC;QACH,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC1B,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,QAAQ,CAAC,kBAAkB,EAAE,4BAA4B,CAAC,CAAC;IACvE,CAAC;IACD,MAAM,QAAQ,GAAG,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC5E,IACE,CAAC,GAAG,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,QAAQ,KAAK,OAAO,IAAI,QAAQ,CAAC,CAAC;QACtE,GAAG,CAAC,QAAQ;QACZ,GAAG,CAAC,QAAQ;QACZ,GAAG,CAAC,MAAM;QACV,GAAG,CAAC,IAAI;QACR,GAAG,CAAC,QAAQ,KAAK,GAAG,EACpB,CAAC;QACD,MAAM,IAAI,QAAQ,CAAC,kBAAkB,EAAE,sCAAsC,CAAC,CAAC;IACjF,CAAC;IACD,OAAO;QACL,QAAQ,EAAE,GAAG,CAAC,MAAM;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,OAAO;QACjC,SAAS,EAAE,MAAM;KAClB,CAAC;AACJ,CAAC"}
|
|
@@ -61,22 +61,12 @@ export type DemoPreview = {
|
|
|
61
61
|
url: string;
|
|
62
62
|
viewed: boolean;
|
|
63
63
|
};
|
|
64
|
-
export type DevelopmentSnapshot = {
|
|
65
|
-
status: 'READY';
|
|
66
|
-
snapshotId: string;
|
|
67
|
-
messageId: string;
|
|
68
|
-
url: string;
|
|
69
|
-
} | {
|
|
70
|
-
status: 'PENDING' | 'UNAVAILABLE';
|
|
71
|
-
messageId: string;
|
|
72
|
-
reason: string;
|
|
73
|
-
};
|
|
74
64
|
export type DevelopmentProgress = {
|
|
75
65
|
stage: 'READY' | 'PLANNING' | 'PLAN_REVIEW' | 'FEATURE_SELECTION' | 'EXECUTION_REVIEW' | 'DEVELOPING' | 'COMPLETED';
|
|
76
66
|
started: boolean;
|
|
77
67
|
planApproved: boolean;
|
|
78
|
-
/**
|
|
79
|
-
|
|
68
|
+
/** 研发主线的稳定预览地址,随主线构建结果更新。 */
|
|
69
|
+
previewUrl?: string;
|
|
80
70
|
};
|
|
81
71
|
export type TaskProgressStatus = 'submitted' | 'queued' | 'running' | 'waiting' | 'needs_input' | 'completed' | 'failed' | 'interrupted' | 'unknown';
|
|
82
72
|
export type TaskProgressItem = {
|
|
@@ -1,9 +1,5 @@
|
|
|
1
1
|
import type { AgentQueryApi } from '../api/agent-query-api.js';
|
|
2
|
-
import type {
|
|
3
|
-
type ReadySnapshot =
|
|
4
|
-
|
|
5
|
-
}>;
|
|
6
|
-
export declare function findDevelopmentSnapshot(query: AgentQueryApi, sessionId: string, messageId: string | Array<string>, options?: {
|
|
7
|
-
fallbackToLatest?: boolean;
|
|
8
|
-
}): Promise<ReadySnapshot | undefined>;
|
|
2
|
+
import type { DemoPreview } from '../contracts/cli-output.js';
|
|
3
|
+
type ReadySnapshot = Pick<DemoPreview, 'snapshotId' | 'messageId' | 'url'>;
|
|
4
|
+
export declare function findDevelopmentSnapshot(query: AgentQueryApi, sessionId: string, messageId: string | Array<string>): Promise<ReadySnapshot | undefined>;
|
|
9
5
|
export {};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/**
|
|
1
|
+
/** 按独立演示轮所属消息匹配快照。@author xiuyu.yi */
|
|
2
2
|
import { z } from 'zod';
|
|
3
3
|
import { parseWire } from '../contracts/node-wire.js';
|
|
4
4
|
import { CliError } from '../output/exit-codes.js';
|
|
@@ -24,16 +24,14 @@ function readySnapshot(snapshot) {
|
|
|
24
24
|
if (url.protocol !== 'https:' || url.username || url.password)
|
|
25
25
|
throw new CliError('PROTOCOL_ERROR', '研发快照未提供安全的 HTTPS 地址');
|
|
26
26
|
return {
|
|
27
|
-
status: 'READY',
|
|
28
27
|
snapshotId: snapshot.encryptedId,
|
|
29
28
|
messageId: snapshot.messageId,
|
|
30
29
|
url: snapshot.visitUrl,
|
|
31
30
|
};
|
|
32
31
|
}
|
|
33
|
-
export async function findDevelopmentSnapshot(query, sessionId, messageId
|
|
32
|
+
export async function findDevelopmentSnapshot(query, sessionId, messageId) {
|
|
34
33
|
const messageIds = new Set(Array.isArray(messageId) ? messageId : [messageId]);
|
|
35
34
|
const seen = new Set();
|
|
36
|
-
let latest;
|
|
37
35
|
for (let page = 1;; page++) {
|
|
38
36
|
const response = parseWire(pageSchema, await query.developmentSnapshots(sessionId, page));
|
|
39
37
|
const items = Array.isArray(response) ? response : response.data;
|
|
@@ -43,15 +41,10 @@ export async function findDevelopmentSnapshot(query, sessionId, messageId, optio
|
|
|
43
41
|
if (snapshot) {
|
|
44
42
|
if (snapshot.visitUrl)
|
|
45
43
|
return readySnapshot(snapshot);
|
|
46
|
-
|
|
47
|
-
return undefined;
|
|
44
|
+
return undefined;
|
|
48
45
|
}
|
|
49
|
-
// 查完所有分页后才允许兜底,避免第一页面的新快照遮住后续页面的本轮匹配。
|
|
50
|
-
for (const item of items)
|
|
51
|
-
if (item.visitUrl && (!latest || item.createdAt > latest.createdAt))
|
|
52
|
-
latest = item;
|
|
53
46
|
if (!items.length || (Array.isArray(response) ? items.length < 50 : page * 50 >= response.totalCount))
|
|
54
|
-
return
|
|
47
|
+
return undefined;
|
|
55
48
|
if (items.every((item) => seen.has(item.encryptedId)))
|
|
56
49
|
throw new CliError('PROTOCOL_ERROR', '研发快照分页未前进,请稍后重试查询');
|
|
57
50
|
for (const item of items)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"development-snapshot.js","sourceRoot":"","sources":["../../src/conversation/development-snapshot.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"development-snapshot.js","sourceRoot":"","sources":["../../src/conversation/development-snapshot.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ export function hasCompletedCreationResult(result) {
|
|
|
7
7
|
(result.state === 'NEEDS_INPUT' &&
|
|
8
8
|
result.development?.stage === 'FEATURE_SELECTION' &&
|
|
9
9
|
(result.interactions ?? []).every((item) => item.kind === 'SELECT_FEATURES') &&
|
|
10
|
-
|
|
10
|
+
!!result.development.previewUrl));
|
|
11
11
|
}
|
|
12
12
|
const QUESTIONNAIRE_INSTRUCTION = '请一次性向用户完整展示当前交互 questions 中的全部问题和选项:保留原始问题、选项标签及说明,标明题号、选项编号、multiSelect 单选/多选规则和 allowOther 自定义回答能力;展示编号须与 question.id、options.index 对应,不要只概括问题、逐题提问或省略选项。提示用户“请按题号回答,例如1A、2B,也可以补充自己的要求”,示例不代表固定题数或默认答案。收集整份问卷的回答;若用户仅回答部分题目,保留已答内容并一次性展示剩余问题及选项,不要替用户选择推荐项,答案齐全后再统一提交';
|
|
13
13
|
const PLAN_REVIEW_INSTRUCTION = '请按 messages 顺序展示原始规划对话,与产品页面保持一致,不自行摘要、改写或追加 attachments 中的完整研发规划。然后展示:\n- **确认规划**:回复 **“确认规划”** 继续。\n- **调整功能**:直接告诉我需要增加或修改的内容。\n每次调整后都要等待并展示更新方案,再次给出这两个入口;如果服务端再次提问,先回答问题再等待方案。补充要求不等于确认,不能确认旧方案。';
|
|
@@ -30,7 +30,7 @@ export function buildNextActions(result, config) {
|
|
|
30
30
|
const completed = hasCompletedCreationResult(result);
|
|
31
31
|
return nextActionsForState(result, config).map((action) => {
|
|
32
32
|
const progressInstruction = completed
|
|
33
|
-
? '整轮已结束,按 messages
|
|
33
|
+
? '整轮已结束,按 messages 顺序原样展示本轮完成说明,保留服务端返回的内容、预览链接和后续引导。不改写为步骤表或结束卡片,不以 taskProgress.markdown 替代原始回复。'
|
|
34
34
|
: result.taskProgress
|
|
35
35
|
? '每次查询都展示 taskProgress.markdown 进度卡,即使 changed 为 false 也展示。按 Glow 开发中列表展示当前返回的功能和步骤,不从历史消息补回已完成的功能或旧步骤;等待中的功能只展示标题与状态。不追加执行详情或工具次数。界面支持原位更新时按 taskProgress.id 更新同一张卡,否则每次展示当前快照。保留状态待同步提示,不虚构阶段或百分比。'
|
|
36
36
|
: '';
|
|
@@ -68,15 +68,6 @@ function nextActionsForState(result, config) {
|
|
|
68
68
|
command: [...command, 'wait', ...progressOptions, '--', result.sessionId],
|
|
69
69
|
},
|
|
70
70
|
];
|
|
71
|
-
if (result.development?.snapshot?.status === 'PENDING')
|
|
72
|
-
return [
|
|
73
|
-
{
|
|
74
|
-
action: 'WAIT',
|
|
75
|
-
instruction: '本轮任务已结束,正在同步对应的研发快照;继续查询,不重复提交研发需求,不使用旧演示链接代替本轮快照。',
|
|
76
|
-
requiresUserInput: false,
|
|
77
|
-
command: [...command, 'wait', ...progressOptions, '--', result.sessionId],
|
|
78
|
-
},
|
|
79
|
-
];
|
|
80
71
|
if (result.state === 'NEEDS_INPUT' || result.state === 'NEEDS_SELECTION') {
|
|
81
72
|
const interactions = result.interactions ?? [];
|
|
82
73
|
if (interactions.length) {
|
|
@@ -122,8 +113,7 @@ function nextActionsForState(result, config) {
|
|
|
122
113
|
result.development.stage === 'FEATURE_SELECTION' &&
|
|
123
114
|
interactions.every((interaction) => interaction.kind === 'SELECT_FEATURES')) {
|
|
124
115
|
// 已有本轮研发结果时保留完成后的引导;首次功能清单只引导选择开发内容。
|
|
125
|
-
|
|
126
|
-
if (snapshot?.status === 'READY' || snapshot?.status === 'UNAVAILABLE')
|
|
116
|
+
if (result.development.previewUrl)
|
|
127
117
|
return developmentActions(result, command);
|
|
128
118
|
nextActions.push({
|
|
129
119
|
action: 'CONTINUE_CHAT',
|
|
@@ -222,12 +212,9 @@ function nextActionsForState(result, config) {
|
|
|
222
212
|
return [];
|
|
223
213
|
}
|
|
224
214
|
function developmentActions(result, command) {
|
|
225
|
-
const
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
: snapshot?.status === 'UNAVAILABLE'
|
|
229
|
-
? `先展示原始结果,并如实说明:${snapshot.reason} 不伪造快照链接,不宣称本轮没有产出。`
|
|
230
|
-
: '先按 messages 顺序展示原始对话,不把规划确认当作研发完成,也不要求规划轮产生新快照。';
|
|
215
|
+
const previewInstruction = result.development?.previewUrl
|
|
216
|
+
? '先展示本轮原始结果和 development.previewUrl,链接统一命名为“查看预览”,不将预览称为已正式发布。'
|
|
217
|
+
: '先按 messages 顺序展示原始对话,不把规划确认当作研发完成。';
|
|
231
218
|
const instruction = `${previewInstruction} 然后按以下两条独立列表原样展示,不合并或改名:\n- **继续创作**:直接告诉我想新增或调整的内容。\n- **上线运营**:回复 **“上线运营”**,我会发布最新版本并返回访问链接。`;
|
|
232
219
|
return [
|
|
233
220
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"next-actions.js","sourceRoot":"","sources":["../../src/conversation/next-actions.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,GACjB,MAAM,4CAA4C,CAAC;AAkBpD,0CAA0C;AAC1C,MAAM,UAAU,0BAA0B,CAAC,MAAsB;IAC/D,OAAO,CACL,MAAM,CAAC,KAAK,KAAK,WAAW;QAC5B,CAAC,MAAM,CAAC,KAAK,KAAK,aAAa;YAC7B,MAAM,CAAC,WAAW,EAAE,KAAK,KAAK,mBAAmB;YACjD,CAAC,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,iBAAiB,CAAC;YAC5E,CAAC,
|
|
1
|
+
{"version":3,"file":"next-actions.js","sourceRoot":"","sources":["../../src/conversation/next-actions.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { enabled, list, object, text } from '../../contracts/value.js';
|
|
|
3
3
|
import { currentRound, roundMessage } from '../../conversation/round-selector.js';
|
|
4
4
|
import { CliError } from '../../output/exit-codes.js';
|
|
5
5
|
import { DEFAULT_ENDPOINT } from '../../config/constants.js';
|
|
6
|
+
import { getSuperunHostingDomain } from '../../config/runtime-config.js';
|
|
6
7
|
/** 根据本次并行创建响应固定等待目标,不能用历史批次替代。 */
|
|
7
8
|
export function styleWaitTarget(response) {
|
|
8
9
|
if (!Array.isArray(response.items))
|
|
@@ -60,11 +61,7 @@ function stylePreviewUrl(item, endpoint) {
|
|
|
60
61
|
: text(item.snapshotId)?.trim();
|
|
61
62
|
if (!snapshotId || !/^[a-zA-Z0-9_-]+$/.test(snapshotId))
|
|
62
63
|
return undefined;
|
|
63
|
-
const
|
|
64
|
-
const china = ['superun.com', 'suxiaoqiang.com'].some((domain) => hostname === domain || hostname.endsWith(`.${domain}`)) ||
|
|
65
|
-
['superun.pre.qima-inc.com', 'localhost', '127.0.0.1', '[::1]'].includes(hostname) ||
|
|
66
|
-
hostname.startsWith('172.18.');
|
|
67
|
-
const url = new URL(`https://snapshot--${snapshotId}.${china ? 'superun.yun' : 'superun.app'}`);
|
|
64
|
+
const url = new URL(`https://snapshot--${snapshotId}.${getSuperunHostingDomain(endpoint)}`);
|
|
68
65
|
if (typeof item.updateTimestamp === 'number' &&
|
|
69
66
|
Number.isSafeInteger(item.updateTimestamp) &&
|
|
70
67
|
item.updateTimestamp > 0)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"style-selection.js","sourceRoot":"","sources":["../../../src/interactions/parsers/style-selection.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAEvE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAGlF,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"style-selection.js","sourceRoot":"","sources":["../../../src/interactions/parsers/style-selection.ts"],"names":[],"mappings":"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"}
|
package/dist/runtime.d.ts
CHANGED
|
@@ -30,7 +30,7 @@ export declare class CreationRuntime {
|
|
|
30
30
|
readonly previewVersions: PreviewVersionApi;
|
|
31
31
|
readonly waiter: SessionWaiter;
|
|
32
32
|
readonly taskProgress: TaskProgressReader;
|
|
33
|
-
private
|
|
33
|
+
private demoSnapshotSync?;
|
|
34
34
|
constructor(client: ApiClient, output: OutputWriter);
|
|
35
35
|
load(sessionId: string): Promise<SessionView>;
|
|
36
36
|
choices(sessionId: string, anchor?: string, view?: SessionView): Promise<Array<Choice>>;
|
package/dist/runtime.js
CHANGED
|
@@ -7,7 +7,8 @@ import { IntegrationApi } from './api/integration-api.js';
|
|
|
7
7
|
import { PluginApi } from './api/plugin-api.js';
|
|
8
8
|
import { PublishApi } from './api/publish-api.js';
|
|
9
9
|
import { PreviewVersionApi } from './api/preview-version-api.js';
|
|
10
|
-
import { enabled,
|
|
10
|
+
import { enabled, object, text } from './contracts/value.js';
|
|
11
|
+
import { getSuperunHostingDomain } from './config/runtime-config.js';
|
|
11
12
|
import { collectInteractions } from './interactions/registry.js';
|
|
12
13
|
import { toolId as sourceToolId, toolData } from './interactions/context.js';
|
|
13
14
|
import { integrationKey } from './interactions/handlers/reply-plugin.js';
|
|
@@ -15,15 +16,14 @@ import { isStyleSelected, projectChoices, styleBranchAnchor, styleChoiceLabel, s
|
|
|
15
16
|
import { resolveState } from './conversation/state-resolver.js';
|
|
16
17
|
import { buildNextActions, hasCompletedCreationResult } from './conversation/next-actions.js';
|
|
17
18
|
import { demoGenerationStatus, findModifiedDemoPreview, isInitialDemoRound, projectDemoPreview, } from './conversation/demo-preview.js';
|
|
18
|
-
import { findDevelopmentSnapshot } from './conversation/development-snapshot.js';
|
|
19
19
|
import { currentRound, roundMessage } from './conversation/round-selector.js';
|
|
20
20
|
import { SessionWaiter } from './conversation/session-waiter.js';
|
|
21
21
|
import { CliError } from './output/exit-codes.js';
|
|
22
22
|
import { dispatchReply } from './interactions/handlers/index.js';
|
|
23
23
|
import { TaskProgressReader } from './conversation/task-progress-reader.js';
|
|
24
24
|
import { submittedTaskProgress, taskProgressSnapshot } from './conversation/task-progress.js';
|
|
25
|
-
//
|
|
26
|
-
const
|
|
25
|
+
// 仅独立演示版本等待快照同步,研发主线直接使用稳定预览地址。
|
|
26
|
+
const DEMO_SNAPSHOT_SYNC_MS = 15_000;
|
|
27
27
|
export class CreationRuntime {
|
|
28
28
|
client;
|
|
29
29
|
output;
|
|
@@ -37,7 +37,7 @@ export class CreationRuntime {
|
|
|
37
37
|
previewVersions;
|
|
38
38
|
waiter;
|
|
39
39
|
taskProgress;
|
|
40
|
-
|
|
40
|
+
demoSnapshotSync;
|
|
41
41
|
constructor(client, output) {
|
|
42
42
|
this.client = client;
|
|
43
43
|
this.output = output;
|
|
@@ -156,12 +156,12 @@ export class CreationRuntime {
|
|
|
156
156
|
if (modifiedDemo) {
|
|
157
157
|
result.demo = await findModifiedDemoPreview(this.query, view);
|
|
158
158
|
if (result.demo)
|
|
159
|
-
this.
|
|
159
|
+
this.demoSnapshotSync = undefined;
|
|
160
160
|
else {
|
|
161
161
|
const key = `demo:${view.session.sessionId}:${currentRound(view)?.roundId}`;
|
|
162
|
-
if (this.
|
|
163
|
-
this.
|
|
164
|
-
if (Date.now() - this.
|
|
162
|
+
if (this.demoSnapshotSync?.key !== key)
|
|
163
|
+
this.demoSnapshotSync = { key, startedAt: Date.now() };
|
|
164
|
+
if (Date.now() - this.demoSnapshotSync.startedAt < DEMO_SNAPSHOT_SYNC_MS)
|
|
165
165
|
return { ...result, state: 'RUNNING' };
|
|
166
166
|
}
|
|
167
167
|
}
|
|
@@ -193,37 +193,10 @@ export class CreationRuntime {
|
|
|
193
193
|
onlyFeatureSelection &&
|
|
194
194
|
['COMPLETED', 'NEEDS_INPUT'].includes(result.state) &&
|
|
195
195
|
!['start_dev', 'architecture_plan_approve'].includes(String(roundExtra.business_type))) {
|
|
196
|
-
const
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
...list(current.meta?.sourceMessageIds).map(text),
|
|
201
|
-
...[...current.userItems, ...current.agentItems].map((item) => item.source?.messageId),
|
|
202
|
-
].filter((id) => !!id);
|
|
203
|
-
const snapshot = await findDevelopmentSnapshot(this.query, view.session.sessionId, messageIds, {
|
|
204
|
-
fallbackToLatest: true,
|
|
205
|
-
});
|
|
206
|
-
if (snapshot) {
|
|
207
|
-
result.development.snapshot = snapshot;
|
|
208
|
-
this.snapshotSync = undefined;
|
|
209
|
-
}
|
|
210
|
-
else {
|
|
211
|
-
const key = `${view.session.sessionId}:${messageId}`;
|
|
212
|
-
if (this.snapshotSync?.key !== key)
|
|
213
|
-
this.snapshotSync = { key, startedAt: Date.now() };
|
|
214
|
-
const pending = Date.now() - this.snapshotSync.startedAt < DEVELOPMENT_SNAPSHOT_SYNC_MS;
|
|
215
|
-
result.development.snapshot = {
|
|
216
|
-
status: pending ? 'PENDING' : 'UNAVAILABLE',
|
|
217
|
-
messageId,
|
|
218
|
-
reason: pending
|
|
219
|
-
? '正在同步本轮研发快照,请稍候。'
|
|
220
|
-
: '本轮及项目历史中暂未查到可用的研发快照,可稍后查询。',
|
|
221
|
-
};
|
|
222
|
-
if (pending) {
|
|
223
|
-
result.state = 'RUNNING';
|
|
224
|
-
result.interactions = [];
|
|
225
|
-
}
|
|
226
|
-
}
|
|
196
|
+
const sessionId = view.session.sessionId;
|
|
197
|
+
if (!/^[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,57}[a-zA-Z0-9])?$/.test(sessionId))
|
|
198
|
+
throw new CliError('PROTOCOL_ERROR', '会话标识无法生成有效的预览地址');
|
|
199
|
+
result.development.previewUrl = `https://id--${sessionId}.${getSuperunHostingDomain(this.client.config.endpoint)}`;
|
|
227
200
|
}
|
|
228
201
|
}
|
|
229
202
|
return result;
|
package/dist/runtime.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export declare const NPM_FETCH_OPTIONS: string[];
|
|
2
|
+
export declare class NpmCommandError extends Error {
|
|
3
|
+
readonly reason: string;
|
|
4
|
+
constructor(reason: string);
|
|
5
|
+
}
|
|
6
|
+
export declare function runNpm(args: Array<string>, options?: {
|
|
7
|
+
registry?: string;
|
|
8
|
+
timeoutMs?: number;
|
|
9
|
+
}): Promise<string>;
|
|
10
|
+
export declare function latestVersion(): Promise<{
|
|
11
|
+
version: string;
|
|
12
|
+
registry: string;
|
|
13
|
+
}>;
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
/** npm 版本查询与安装共用网络配置,恢复过程不打断业务输出。@author xiuyu.yi */
|
|
2
|
+
import { execFile } from 'node:child_process';
|
|
3
|
+
import { promisify } from 'node:util';
|
|
4
|
+
import { valid } from 'semver';
|
|
5
|
+
import { NPM_REGISTRY, PACKAGE_NAME, PACKAGE_PRIVATE } from '../config/constants.js';
|
|
6
|
+
import { object, text } from '../contracts/value.js';
|
|
7
|
+
import { CliError } from '../output/exit-codes.js';
|
|
8
|
+
const execute = promisify(execFile);
|
|
9
|
+
export const NPM_FETCH_OPTIONS = [
|
|
10
|
+
'--fetch-retries=2',
|
|
11
|
+
'--fetch-retry-mintimeout=1000',
|
|
12
|
+
'--fetch-retry-maxtimeout=3000',
|
|
13
|
+
'--fetch-timeout=15000',
|
|
14
|
+
];
|
|
15
|
+
export class NpmCommandError extends Error {
|
|
16
|
+
reason;
|
|
17
|
+
constructor(reason) {
|
|
18
|
+
super(reason);
|
|
19
|
+
this.reason = reason;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
export async function runNpm(args, options = {}) {
|
|
23
|
+
const env = { ...process.env };
|
|
24
|
+
if (options.registry) {
|
|
25
|
+
delete env.NPM_CONFIG_REGISTRY;
|
|
26
|
+
env.npm_config_registry = options.registry;
|
|
27
|
+
}
|
|
28
|
+
try {
|
|
29
|
+
const { stdout } = await execute('npm', args, {
|
|
30
|
+
encoding: 'utf8',
|
|
31
|
+
timeout: options.timeoutMs ?? 55_000,
|
|
32
|
+
killSignal: 'SIGKILL',
|
|
33
|
+
maxBuffer: 2_000_000,
|
|
34
|
+
// Registry 可能包含认证信息,只通过环境传入,不回显命令或 npm 原始诊断。
|
|
35
|
+
env,
|
|
36
|
+
});
|
|
37
|
+
return stdout.trim();
|
|
38
|
+
}
|
|
39
|
+
catch (error) {
|
|
40
|
+
const failure = object(error);
|
|
41
|
+
const stderr = text(failure.stderr) ?? '';
|
|
42
|
+
const reason = failure.killed
|
|
43
|
+
? 'ETIMEDOUT'
|
|
44
|
+
: typeof failure.code === 'string'
|
|
45
|
+
? failure.code
|
|
46
|
+
: /npm (?:ERR!|error) code ([A-Z0-9_]+)/.exec(stderr)?.[1];
|
|
47
|
+
throw new NpmCommandError(reason && /^[A-Z0-9_]+$/.test(reason) ? reason : 'NPM_REQUEST_FAILED');
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
export async function latestVersion() {
|
|
51
|
+
if (PACKAGE_PRIVATE)
|
|
52
|
+
throw new CliError('UPDATE_REQUIRED', '当前为未发布的私有开发包;正式包名和 Registry 确认并发布后才能启用业务命令');
|
|
53
|
+
const registries = [NPM_REGISTRY];
|
|
54
|
+
try {
|
|
55
|
+
const configured = new URL(await runNpm(['config', 'get', 'registry'], { timeoutMs: 5000 }));
|
|
56
|
+
if (['https:', 'http:'].includes(configured.protocol) &&
|
|
57
|
+
!configured.search &&
|
|
58
|
+
!configured.hash &&
|
|
59
|
+
configured.href !== new URL(NPM_REGISTRY).href)
|
|
60
|
+
registries.push(configured.href);
|
|
61
|
+
}
|
|
62
|
+
catch {
|
|
63
|
+
// 读取配置失败不妨碍官方源查询;npm 缺失等问题由下面的正式检查统一报告。
|
|
64
|
+
}
|
|
65
|
+
const failures = [];
|
|
66
|
+
for (const [index, registry] of registries.entries()) {
|
|
67
|
+
try {
|
|
68
|
+
const raw = await runNpm(['view', PACKAGE_NAME, 'dist-tags.latest', '--json', '--prefer-online', ...NPM_FETCH_OPTIONS], { registry });
|
|
69
|
+
let version;
|
|
70
|
+
try {
|
|
71
|
+
version = JSON.parse(raw);
|
|
72
|
+
}
|
|
73
|
+
catch {
|
|
74
|
+
throw new NpmCommandError('INVALID_VERSION_RESPONSE');
|
|
75
|
+
}
|
|
76
|
+
if (typeof version !== 'string' || valid(version) !== version)
|
|
77
|
+
throw new NpmCommandError('INVALID_VERSION_RESPONSE');
|
|
78
|
+
return { version, registry };
|
|
79
|
+
}
|
|
80
|
+
catch (error) {
|
|
81
|
+
failures.push({
|
|
82
|
+
source: index === 0 ? 'official' : 'configured',
|
|
83
|
+
reason: error instanceof NpmCommandError ? error.reason : 'NPM_REQUEST_FAILED',
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
throw new CliError('VERSION_CHECK_FAILED', '版本检查在自动重试后仍失败,请检查 npm 网络、代理或证书配置;业务请求未发送', { checks: failures });
|
|
88
|
+
}
|
|
89
|
+
//# sourceMappingURL=npm-registry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"npm-registry.js","sourceRoot":"","sources":["../../src/update/npm-registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { OutputWriter } from '../output/writer.js';
|
|
2
|
-
export declare function versionGate(argv: Array<string>,
|
|
2
|
+
export declare function versionGate(argv: Array<string>, _output: OutputWriter, updateOnly?: boolean): Promise<{
|
|
3
3
|
reexecuted: boolean;
|
|
4
4
|
version: string;
|
|
5
5
|
exitCode?: number;
|
|
@@ -4,56 +4,21 @@ import { readFile, mkdir, mkdtemp, rename, rm, stat } from 'node:fs/promises';
|
|
|
4
4
|
import { homedir } from 'node:os';
|
|
5
5
|
import { randomUUID } from 'node:crypto';
|
|
6
6
|
import { join } from 'node:path';
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
9
|
-
import { object, text } from '../contracts/value.js';
|
|
7
|
+
import { PACKAGE_NAME, PACKAGE_VERSION } from '../config/constants.js';
|
|
8
|
+
import { object } from '../contracts/value.js';
|
|
10
9
|
import { CliError } from '../output/exit-codes.js';
|
|
11
10
|
import { withUpdateLock } from './update-lock.js';
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
child.stdout.on('data', (chunk) => {
|
|
17
|
-
if (capture)
|
|
18
|
-
captured += chunk.toString();
|
|
19
|
-
else
|
|
20
|
-
output.log(chunk.toString().trimEnd());
|
|
21
|
-
});
|
|
22
|
-
child.stderr.on('data', (chunk) => output.log(chunk.toString().trimEnd()));
|
|
23
|
-
child.once('error', () => reject(new CliError('UPDATE_FAILED', '无法执行 npm,请检查安装与 PATH')));
|
|
24
|
-
child.once('close', (code) => code === 0
|
|
25
|
-
? resolve(captured.trim())
|
|
26
|
-
: reject(new CliError('UPDATE_FAILED', 'npm 更新失败,业务请求未发送')));
|
|
27
|
-
});
|
|
28
|
-
}
|
|
29
|
-
async function latestVersion() {
|
|
30
|
-
if (PACKAGE_PRIVATE)
|
|
31
|
-
throw new CliError('UPDATE_REQUIRED', '当前为未发布的私有开发包;正式包名和 Registry 确认并发布后才能启用业务命令');
|
|
32
|
-
try {
|
|
33
|
-
const response = await fetch(`${NPM_REGISTRY}${encodeURIComponent(PACKAGE_NAME)}`, {
|
|
34
|
-
signal: AbortSignal.timeout(15_000),
|
|
35
|
-
redirect: 'error',
|
|
36
|
-
});
|
|
37
|
-
if (!response.ok)
|
|
38
|
-
throw new Error('registry');
|
|
39
|
-
const data = await response.json();
|
|
40
|
-
const latest = text(object(object(data)['dist-tags']).latest);
|
|
41
|
-
if (!latest || valid(latest) !== latest)
|
|
42
|
-
throw new Error('version');
|
|
43
|
-
return latest;
|
|
44
|
-
}
|
|
45
|
-
catch {
|
|
46
|
-
throw new CliError('VERSION_CHECK_FAILED', '无法确认 npm latest 版本,业务请求未发送');
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
export async function versionGate(argv, output, updateOnly = false) {
|
|
50
|
-
let required = await latestVersion();
|
|
11
|
+
import { latestVersion, runNpm, NPM_FETCH_OPTIONS, NpmCommandError } from './npm-registry.js';
|
|
12
|
+
export async function versionGate(argv, _output, updateOnly = false) {
|
|
13
|
+
let source = await latestVersion();
|
|
14
|
+
let required = source.version;
|
|
51
15
|
if (required === PACKAGE_VERSION)
|
|
52
16
|
return { reexecuted: false, version: required };
|
|
53
17
|
if (process.env.SUPERUN_AI_CLI_REEXEC === '1')
|
|
54
18
|
throw new CliError('UPDATE_FAILED', '重启后版本仍不匹配,已停止重复更新');
|
|
55
19
|
const entry = await withUpdateLock(async () => {
|
|
56
|
-
|
|
20
|
+
source = await latestVersion();
|
|
21
|
+
required = source.version;
|
|
57
22
|
const root = join(homedir(), '.cache', PACKAGE_NAME, 'versions');
|
|
58
23
|
await mkdir(root, { recursive: true, mode: 0o700 });
|
|
59
24
|
const destination = join(root, required);
|
|
@@ -77,19 +42,22 @@ export async function versionGate(argv, output, updateOnly = false) {
|
|
|
77
42
|
return cached;
|
|
78
43
|
const staging = await mkdtemp(join(root, `.${required}-`));
|
|
79
44
|
try {
|
|
80
|
-
await
|
|
45
|
+
await runNpm([
|
|
81
46
|
'install',
|
|
82
47
|
'--prefix',
|
|
83
48
|
staging,
|
|
84
49
|
'--no-save',
|
|
85
50
|
'--package-lock=false',
|
|
86
51
|
`${PACKAGE_NAME}@${required}`,
|
|
87
|
-
|
|
88
|
-
NPM_REGISTRY,
|
|
52
|
+
...NPM_FETCH_OPTIONS,
|
|
89
53
|
'--ignore-scripts',
|
|
90
54
|
'--no-audit',
|
|
91
55
|
'--no-fund',
|
|
92
|
-
],
|
|
56
|
+
], { registry: source.registry, timeoutMs: 180_000 }).catch((error) => {
|
|
57
|
+
throw new CliError('UPDATE_FAILED', 'npm 自动更新失败,业务请求未发送', {
|
|
58
|
+
reason: error instanceof NpmCommandError ? error.reason : 'NPM_REQUEST_FAILED',
|
|
59
|
+
});
|
|
60
|
+
});
|
|
93
61
|
if (!(await verifiedEntry(staging)))
|
|
94
62
|
throw new CliError('UPDATE_FAILED', '安装后的版本或执行入口校验失败');
|
|
95
63
|
if (await stat(destination).catch(() => undefined))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-gate.js","sourceRoot":"","sources":["../../src/update/version-gate.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"version-gate.js","sourceRoot":"","sources":["../../src/update/version-gate.ts"],"names":[],"mappings":"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"}
|