dsh-plugin-opc 0.1.16 → 0.1.17
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/lib/client.js +38 -213
- package/lib/index.js +200 -79
- package/package.json +1 -1
- package/runtime/app_delivery/SKILL.md +1 -1
- package/runtime/app_delivery/references/contract.md +1 -0
- package/runtime/app_delivery/scripts/delivery.py +40 -8
- package/runtime/app_delivery_auth.py +29 -12
- package/runtime/app_delivery_migration.py +122 -34
- package/runtime/worker.py +16 -13
package/lib/index.js
CHANGED
|
@@ -1900,6 +1900,16 @@ import { Transform } from "node:stream";
|
|
|
1900
1900
|
import { pipeline } from "node:stream/promises";
|
|
1901
1901
|
import { fileURLToPath } from "node:url";
|
|
1902
1902
|
var ROLLBACK_NOTICE = "\u56DE\u6EDA\u6062\u590D\u4EE3\u7801\u4E0E\u8FD0\u884C\u914D\u7F6E\uFF0C\u4E0D\u81EA\u52A8\u56DE\u9000\u6570\u636E\u5E93/\u5377\u4E2D\u7684\u4E1A\u52A1\u6570\u636E\uFF1B\u65E7\u4EE3\u7801\u548C\u65B0\u6570\u636E\u517C\u5BB9\u6027\u4ECD\u9700\u9A8C\u8BC1\u3002";
|
|
1903
|
+
function analysisQuestions(proposal) {
|
|
1904
|
+
return [.../* @__PURE__ */ new Set([...proposal?.unresolved ?? [], ...proposal?.contract?.unresolved ?? []])];
|
|
1905
|
+
}
|
|
1906
|
+
function appendAnalysisFeedback(job, text3) {
|
|
1907
|
+
job.conversation = [...job.conversation ?? [], { role: "user", text: text3, revision: job.revisionCount }];
|
|
1908
|
+
job.feedbackHistory = job.feedbackHistory ? `${job.feedbackHistory}
|
|
1909
|
+
|
|
1910
|
+
\u672C\u6B21\u8865\u5145\uFF08\u6709\u51B2\u7A81\u65F6\u4EE5\u672C\u6B21\u4E3A\u51C6\uFF09\uFF1A
|
|
1911
|
+
${text3}` : text3;
|
|
1912
|
+
}
|
|
1903
1913
|
function matchesReceipt(log, hashes) {
|
|
1904
1914
|
return !!hashes?.["app.tar"] && !!hashes["skill.zip"] && typeof log === "string" && log.includes(`[Artifact] app.tar:${hashes["app.tar"]}
|
|
1905
1915
|
`) && log.includes(`[Artifact] skill.zip:${hashes["skill.zip"]}
|
|
@@ -2253,7 +2263,7 @@ ${combinedLog}` : combinedLog).slice(-24e3);
|
|
|
2253
2263
|
};
|
|
2254
2264
|
}
|
|
2255
2265
|
public(job, root) {
|
|
2256
|
-
const { proposal, skillMarkdown: _sm, dockerfileContent: _df, configDraft
|
|
2266
|
+
const { proposal, skillMarkdown: _sm, dockerfileContent: _df, configDraft, confirmationToken: _token, analysisSessions: _analysisSessions, autoPrepared, ...rest } = job;
|
|
2257
2267
|
const hasOrigSet = new Set(job.hasOriginalKeys ?? []);
|
|
2258
2268
|
const runtimeConfigs = (proposal?.contract?.configs ?? []).map((c) => {
|
|
2259
2269
|
const hasOrig = hasOrigSet.has(c.key) || Boolean(c.has_original_value);
|
|
@@ -2269,15 +2279,19 @@ ${combinedLog}` : combinedLog).slice(-24e3);
|
|
|
2269
2279
|
};
|
|
2270
2280
|
});
|
|
2271
2281
|
const artifactFiles = job.hashes && job.revision && /^[a-z0-9]+$/i.test(job.revision) ? Object.fromEntries(["app.tar", "skill.zip", "app-manifest.json", "summary.json"].filter((name2) => name2 in job.hashes || name2 === "summary.json").map((name2) => [name2, root ? join3(root, job.revision, "bundle", name2) : join3(job.revision, "bundle", name2)])) : void 0;
|
|
2282
|
+
const artifactHash = job.hashes ? fingerprint(job.hashes) : void 0;
|
|
2272
2283
|
return {
|
|
2273
2284
|
...rest,
|
|
2285
|
+
analysisChatStarting: !job.analysisSessionId && this.analyses.has(job.id),
|
|
2286
|
+
analysisChatActive: Boolean(job.analysisSessionId && this.analyses.has(job.id) && ["analyzing", "review"].includes(job.status)),
|
|
2274
2287
|
model: job.modelSelection?.model ?? "",
|
|
2275
2288
|
reasoning_effort: job.modelSelection?.reasoningEffort ?? "",
|
|
2276
2289
|
revision_count: job.revisionCount,
|
|
2277
2290
|
analysis_mode: job.analysisMode,
|
|
2278
2291
|
analysis_failure: job.analysisFailure,
|
|
2279
2292
|
pages_verified: job.pagesVerified,
|
|
2280
|
-
artifactHash
|
|
2293
|
+
artifactHash,
|
|
2294
|
+
deploymentReviewPending: Boolean(job.status === "ready" && autoPrepared && artifactHash && configDraft?.artifactHash !== artifactHash),
|
|
2281
2295
|
proposalHash: proposal ? fingerprint(proposal) : void 0,
|
|
2282
2296
|
artifacts: artifactFiles,
|
|
2283
2297
|
runtime_configs: runtimeConfigs,
|
|
@@ -2289,7 +2303,7 @@ ${combinedLog}` : combinedLog).slice(-24e3);
|
|
|
2289
2303
|
proposal: proposal && {
|
|
2290
2304
|
summary: proposal.summary,
|
|
2291
2305
|
issues: proposal.issues ?? [],
|
|
2292
|
-
unresolved:
|
|
2306
|
+
unresolved: analysisQuestions(proposal),
|
|
2293
2307
|
decisions: proposal.decisions ?? [],
|
|
2294
2308
|
changes: proposal.changes?.map((change) => ({
|
|
2295
2309
|
id: change.id,
|
|
@@ -2452,7 +2466,7 @@ ${combinedLog}` : combinedLog).slice(-24e3);
|
|
|
2452
2466
|
job.status = "review";
|
|
2453
2467
|
job.confirmationToken = void 0;
|
|
2454
2468
|
job.error = void 0;
|
|
2455
|
-
job.events.push("\u5DF2\u8FD4\u56DE\u6539\u9020\u65B9\u6848\u6838\u5BF9\u9636\u6BB5
|
|
2469
|
+
job.events.push("\u5DF2\u8FD4\u56DE\u6539\u9020\u65B9\u6848\u6838\u5BF9\u9636\u6BB5");
|
|
2456
2470
|
await this.save(root, job);
|
|
2457
2471
|
this.core.emit("skills-changed");
|
|
2458
2472
|
return this.public(job, root);
|
|
@@ -2506,7 +2520,8 @@ ${combinedLog}` : combinedLog).slice(-24e3);
|
|
|
2506
2520
|
if (!this.analyze) throw new Error("\u6B64 DSH \u7248\u672C\u672A\u63D0\u4F9B\u5E94\u7528\u5206\u6790\u6240\u9700\u7684 Agent \u6269\u5C55");
|
|
2507
2521
|
if (this.busy.has(id) || ["building", "publishing", "unknown"].includes(job.status)) throw new Error("\u8BF7\u5148\u5B8C\u6210\u5F53\u524D\u90E8\u7F72\u72B6\u6001\u6838\u5BF9");
|
|
2508
2522
|
const resume = options?.mode === "resume";
|
|
2509
|
-
|
|
2523
|
+
const waitingForReply = resume && job.status === "review" && analysisQuestions(job.proposal).length > 0;
|
|
2524
|
+
if (resume && (!waitingForReply && job.status !== "failed" || feedback.trim())) throw new Error("\u53EA\u80FD\u7EE7\u7EED\u5DF2\u6682\u505C\u7684\u5E94\u7528\u51C6\u5907");
|
|
2510
2525
|
this.busy.add(id);
|
|
2511
2526
|
if (session && !job.analysisSessions?.includes(session)) job.session = session;
|
|
2512
2527
|
let trimmedFeedback;
|
|
@@ -2519,6 +2534,7 @@ ${combinedLog}` : combinedLog).slice(-24e3);
|
|
|
2519
2534
|
const controller = new AbortController();
|
|
2520
2535
|
const analysisSignal = AbortSignal.any([scope.signal, controller.signal]);
|
|
2521
2536
|
this.analyses.set(id, controller);
|
|
2537
|
+
if (resume && job.failureStage === "preparation") job.analysisFailure ??= job.error;
|
|
2522
2538
|
if (!resume && job.status !== "failed") {
|
|
2523
2539
|
job.analysisFailure = void 0;
|
|
2524
2540
|
if (!job.proposal) await rm2(join3(root, "draft_files.json"), { force: true }).catch(() => {
|
|
@@ -2545,21 +2561,15 @@ ${trimmedFeedback}` : trimmedFeedback || prevFailure).slice(-24e3);
|
|
|
2545
2561
|
job.confirmationToken = void 0;
|
|
2546
2562
|
if (!resume) {
|
|
2547
2563
|
job.revisionCount = (job.revisionCount ?? 0) + 1;
|
|
2548
|
-
if (trimmedFeedback.trim())
|
|
2549
|
-
job.conversation = [...job.conversation ?? [], { role: "user", text: trimmedFeedback.trim(), revision: job.revisionCount }];
|
|
2550
|
-
job.feedbackHistory = job.feedbackHistory ? `${job.feedbackHistory}
|
|
2551
|
-
|
|
2552
|
-
\u672C\u6B21\u8865\u5145\uFF08\u6709\u51B2\u7A81\u65F6\u4EE5\u672C\u6B21\u4E3A\u51C6\uFF09\uFF1A
|
|
2553
|
-
${trimmedFeedback.trim()}` : trimmedFeedback.trim();
|
|
2554
|
-
}
|
|
2564
|
+
if (trimmedFeedback.trim()) appendAnalysisFeedback(job, trimmedFeedback.trim());
|
|
2555
2565
|
}
|
|
2556
|
-
job.status = "analyzing";
|
|
2566
|
+
job.status = waitingForReply ? "review" : "analyzing";
|
|
2557
2567
|
delete job.analysisSessionId;
|
|
2558
2568
|
job.failureStage = void 0;
|
|
2559
2569
|
job.error = void 0;
|
|
2560
2570
|
job.checks = void 0;
|
|
2561
2571
|
job.events.push(
|
|
2562
|
-
resume ? "\u{1F504} \u6B63\u5728\u7EE7\u7EED\u51C6\u5907\u5E94\u7528" : job.analysisMode === "repair" ? "\u{1F527} AI \u6B63\u5728\u8BFB\u53D6\u5931\u8D25\u5236\u54C1\u4E0E\u65E5\u5FD7\u8FDB\u884C\u4E13\u9879\u4FEE\u590D\u5206\u6790" : "\u{1F680} AI \u6B63\u5728\u5206\u6790\u6E90\u7801\uFF1B\u5C1A\u672A\u6267\u884C\u53D1\u5E03"
|
|
2572
|
+
waitingForReply ? "\u6B63\u5728\u6062\u590D\u5DE6\u4FA7\u5206\u6790\u4F1A\u8BDD" : resume ? "\u{1F504} \u6B63\u5728\u7EE7\u7EED\u51C6\u5907\u5E94\u7528" : job.analysisMode === "repair" ? "\u{1F527} AI \u6B63\u5728\u8BFB\u53D6\u5931\u8D25\u5236\u54C1\u4E0E\u65E5\u5FD7\u8FDB\u884C\u4E13\u9879\u4FEE\u590D\u5206\u6790" : "\u{1F680} AI \u6B63\u5728\u5206\u6790\u6E90\u7801\uFF1B\u5C1A\u672A\u6267\u884C\u53D1\u5E03"
|
|
2563
2573
|
);
|
|
2564
2574
|
try {
|
|
2565
2575
|
await rm2(join3(root, "failed_files_read.json"), { force: true });
|
|
@@ -2583,6 +2593,9 @@ ${trimmedFeedback.trim()}` : trimmedFeedback.trim();
|
|
|
2583
2593
|
analysisSignal.throwIfAborted();
|
|
2584
2594
|
scope.assertCurrent();
|
|
2585
2595
|
if (!job.proposal || job.status === "analyzing") throw new Error("AI \u672A\u63D0\u4EA4\u6709\u6548\u6539\u9020\u65B9\u6848\uFF0C\u8BF7\u8865\u5145\u8BF4\u660E\u540E\u91CD\u8BD5");
|
|
2596
|
+
if (job.analysisSessionId && job.status === "review" && !analysisQuestions(job.proposal).length) {
|
|
2597
|
+
await this.prepareJob(root, job, analysisSignal, scope.assertCurrent, true);
|
|
2598
|
+
}
|
|
2586
2599
|
} catch (error) {
|
|
2587
2600
|
const msg = controller.signal.aborted ? "\u7528\u6237\u53D6\u6D88\u5206\u6790" : error instanceof Error ? error.message : String(error);
|
|
2588
2601
|
job.status = controller.signal.aborted ? "cancelled" : "failed";
|
|
@@ -2601,6 +2614,22 @@ ${trimmedFeedback.trim()}` : trimmedFeedback.trim();
|
|
|
2601
2614
|
});
|
|
2602
2615
|
return this.public(job, root);
|
|
2603
2616
|
}
|
|
2617
|
+
async recordAnalysisReply(job, root, text3, signal) {
|
|
2618
|
+
if (job.status !== "analyzing" && job.status !== "review") throw new Error("\u5F53\u524D\u5E94\u7528\u51C6\u5907\u9636\u6BB5\u65E0\u6CD5\u63A5\u6536\u56DE\u590D");
|
|
2619
|
+
const reply = await worker({ action: "redact_feedback", root, text: text3.slice(0, 2e4) }, signal);
|
|
2620
|
+
signal.throwIfAborted();
|
|
2621
|
+
const next = {
|
|
2622
|
+
...job,
|
|
2623
|
+
status: "analyzing",
|
|
2624
|
+
revisionCount: (job.revisionCount ?? 0) + 1,
|
|
2625
|
+
analysisFailure: void 0,
|
|
2626
|
+
events: [...job.events, "\u5DF2\u6536\u5230\u5DE6\u4FA7\u4F1A\u8BDD\u7684\u56DE\u590D\uFF0CAI \u7EE7\u7EED\u6539\u9020"]
|
|
2627
|
+
};
|
|
2628
|
+
appendAnalysisFeedback(next, reply.trim());
|
|
2629
|
+
await this.save(root, next);
|
|
2630
|
+
Object.assign(job, next);
|
|
2631
|
+
return reply;
|
|
2632
|
+
}
|
|
2604
2633
|
async cancelAnalysis(id, expected) {
|
|
2605
2634
|
const scope = this.scope(expected);
|
|
2606
2635
|
await this.open(scope.directory, id);
|
|
@@ -2747,7 +2776,7 @@ ${trimmedFeedback.trim()}` : trimmedFeedback.trim();
|
|
|
2747
2776
|
}
|
|
2748
2777
|
job.status = "review";
|
|
2749
2778
|
job.analysisFailure = void 0;
|
|
2750
|
-
job.events.push(job.proposal.
|
|
2779
|
+
job.events.push(analysisQuestions(job.proposal).length ? "\u7B49\u5F85\u4F60\u5728\u5DE6\u4FA7\u4F1A\u8BDD\u56DE\u590D" : "\u6539\u9020\u65B9\u6848\u5DF2\u901A\u8FC7\u6821\u9A8C");
|
|
2751
2780
|
await this.save(root, job);
|
|
2752
2781
|
}
|
|
2753
2782
|
async prepare(id, proposalHash, expected) {
|
|
@@ -2755,54 +2784,64 @@ ${trimmedFeedback.trim()}` : trimmedFeedback.trim();
|
|
|
2755
2784
|
const { root, job } = await this.open(scope.directory, id);
|
|
2756
2785
|
return this.exclusive(id, async () => {
|
|
2757
2786
|
if (job.status !== "review" || !job.proposal || fingerprint(job.proposal) !== proposalHash) throw new Error("\u65B9\u6848\u5DF2\u53D8\u5316\uFF0C\u8BF7\u5237\u65B0\u540E\u6838\u5BF9");
|
|
2758
|
-
job.
|
|
2759
|
-
|
|
2760
|
-
job.error = void 0;
|
|
2761
|
-
await this.save(root, job);
|
|
2762
|
-
try {
|
|
2763
|
-
const revision = randomUUID4().replaceAll("-", "");
|
|
2764
|
-
const result = await worker({
|
|
2765
|
-
action: "bundle",
|
|
2766
|
-
root,
|
|
2767
|
-
revision,
|
|
2768
|
-
proposal: job.proposal,
|
|
2769
|
-
repair: Boolean(job.failedRevision),
|
|
2770
|
-
failed_revision: job.failedRevision ?? "",
|
|
2771
|
-
failure_feedback: job.failureContext ?? "",
|
|
2772
|
-
expected_port: job.port ?? 8080,
|
|
2773
|
-
revision_count: job.revisionCount ?? 1,
|
|
2774
|
-
feedback: job.feedbackHistory ?? ""
|
|
2775
|
-
}, scope.signal);
|
|
2776
|
-
scope.assertCurrent();
|
|
2777
|
-
job.revision = revision;
|
|
2778
|
-
job.hashes = result.summary.files;
|
|
2779
|
-
job.proposal = result.proposal ?? job.proposal;
|
|
2780
|
-
job.discoveryReport = result.discovery_report ?? job.discoveryReport;
|
|
2781
|
-
job.transformationReport = result.transformation_report ?? job.transformationReport;
|
|
2782
|
-
job.preparationChecks = result.preparation_checks ?? job.preparationChecks;
|
|
2783
|
-
job.skillMarkdown = result.skill_markdown || job.skillMarkdown;
|
|
2784
|
-
job.dockerfileContent = result.dockerfile_content || job.dockerfileContent;
|
|
2785
|
-
job.hasOriginalKeys = result.has_original_keys ?? job.hasOriginalKeys;
|
|
2786
|
-
job.diffs = result.diffs ?? job.diffs;
|
|
2787
|
-
if (result.original_config_values && typeof result.original_config_values === "object") {
|
|
2788
|
-
await this.credentials.write(`orig-${job.id}`, result.original_config_values);
|
|
2789
|
-
}
|
|
2790
|
-
job.status = "ready";
|
|
2791
|
-
job.version = void 0;
|
|
2792
|
-
job.published = void 0;
|
|
2793
|
-
job.restoredVersion = void 0;
|
|
2794
|
-
job.requestId = randomUUID4().replaceAll("-", "");
|
|
2795
|
-
job.confirmationToken = void 0;
|
|
2796
|
-
job.events.push("\u90E8\u7F72\u5305\u5DF2\u751F\u6210\uFF0C\u670D\u52A1\u5668\u6784\u5EFA\u548C\u4E1A\u52A1\u9A8C\u8BC1\u5C1A\u672A\u6267\u884C");
|
|
2797
|
-
} catch (error) {
|
|
2798
|
-
job.status = "failed";
|
|
2799
|
-
job.failureStage = "preparation";
|
|
2800
|
-
job.error = String(error);
|
|
2801
|
-
}
|
|
2802
|
-
await this.save(root, job);
|
|
2787
|
+
if (analysisQuestions(job.proposal).length) throw new Error("\u8BF7\u5148\u5728\u5DE6\u4FA7\u4F1A\u8BDD\u5904\u7406\u5F85\u786E\u8BA4\u4E8B\u9879");
|
|
2788
|
+
await this.prepareJob(root, job, scope.signal, scope.assertCurrent);
|
|
2803
2789
|
return this.public(job, root);
|
|
2804
2790
|
});
|
|
2805
2791
|
}
|
|
2792
|
+
async prepareJob(root, job, signal, assertCurrent, autoPrepared = false) {
|
|
2793
|
+
job.status = "preparing";
|
|
2794
|
+
job.failureStage = void 0;
|
|
2795
|
+
job.error = void 0;
|
|
2796
|
+
job.events.push("\u6B63\u5728\u751F\u6210\u5E76\u68C0\u67E5\u4EA4\u4ED8\u5305");
|
|
2797
|
+
await this.save(root, job);
|
|
2798
|
+
try {
|
|
2799
|
+
const revision = randomUUID4().replaceAll("-", "");
|
|
2800
|
+
const result = await worker({
|
|
2801
|
+
action: "bundle",
|
|
2802
|
+
root,
|
|
2803
|
+
revision,
|
|
2804
|
+
proposal: job.proposal,
|
|
2805
|
+
repair: Boolean(job.failedRevision),
|
|
2806
|
+
failed_revision: job.failedRevision ?? "",
|
|
2807
|
+
failure_feedback: job.failureContext ?? "",
|
|
2808
|
+
expected_port: job.port ?? 8080,
|
|
2809
|
+
revision_count: job.revisionCount ?? 1,
|
|
2810
|
+
feedback: job.feedbackHistory ?? ""
|
|
2811
|
+
}, signal);
|
|
2812
|
+
signal.throwIfAborted();
|
|
2813
|
+
assertCurrent();
|
|
2814
|
+
job.revision = revision;
|
|
2815
|
+
job.hashes = result.summary.files;
|
|
2816
|
+
job.proposal = result.proposal ?? job.proposal;
|
|
2817
|
+
job.discoveryReport = result.discovery_report ?? job.discoveryReport;
|
|
2818
|
+
job.transformationReport = result.transformation_report ?? job.transformationReport;
|
|
2819
|
+
job.preparationChecks = result.preparation_checks ?? job.preparationChecks;
|
|
2820
|
+
job.skillMarkdown = result.skill_markdown || job.skillMarkdown;
|
|
2821
|
+
job.dockerfileContent = result.dockerfile_content || job.dockerfileContent;
|
|
2822
|
+
job.hasOriginalKeys = result.has_original_keys ?? job.hasOriginalKeys;
|
|
2823
|
+
job.diffs = result.diffs ?? job.diffs;
|
|
2824
|
+
if (result.original_config_values && typeof result.original_config_values === "object") {
|
|
2825
|
+
await this.credentials.write(`orig-${job.id}`, result.original_config_values);
|
|
2826
|
+
}
|
|
2827
|
+
signal.throwIfAborted();
|
|
2828
|
+
assertCurrent();
|
|
2829
|
+
job.autoPrepared = autoPrepared;
|
|
2830
|
+
job.status = "ready";
|
|
2831
|
+
job.version = void 0;
|
|
2832
|
+
job.published = void 0;
|
|
2833
|
+
job.restoredVersion = void 0;
|
|
2834
|
+
job.requestId = randomUUID4().replaceAll("-", "");
|
|
2835
|
+
job.confirmationToken = void 0;
|
|
2836
|
+
job.events.push("\u90E8\u7F72\u5305\u5DF2\u751F\u6210\uFF0C\u670D\u52A1\u5668\u6784\u5EFA\u548C\u4E1A\u52A1\u9A8C\u8BC1\u5C1A\u672A\u6267\u884C");
|
|
2837
|
+
} catch (error) {
|
|
2838
|
+
signal.throwIfAborted();
|
|
2839
|
+
job.status = "failed";
|
|
2840
|
+
job.failureStage = "preparation";
|
|
2841
|
+
job.error = String(error);
|
|
2842
|
+
}
|
|
2843
|
+
await this.save(root, job);
|
|
2844
|
+
}
|
|
2806
2845
|
async deploymentConfiguration(job, input, expected) {
|
|
2807
2846
|
const rawConfigs = input.config;
|
|
2808
2847
|
if (!Array.isArray(rawConfigs) || rawConfigs.some((c) => !c || !/^[A-Za-z_][A-Za-z0-9_]*$/.test(c.key) || typeof c.value !== "string" || c.resource_id !== void 0 && typeof c.resource_id !== "string") || new Set(rawConfigs.map((c) => c.key)).size !== rawConfigs.length) throw new Error("\u914D\u7F6E\u683C\u5F0F\u65E0\u6548");
|
|
@@ -3503,6 +3542,9 @@ var bool = { type: "boolean" };
|
|
|
3503
3542
|
var strings = { type: "array", items: str };
|
|
3504
3543
|
var object2 = { type: "object", additionalProperties: true };
|
|
3505
3544
|
var objects = { type: "array", items: object2 };
|
|
3545
|
+
var routeAuth = { ...object2, properties: {
|
|
3546
|
+
evidence: { ...strings, description: "\u8BE5\u8DEF\u7531\u7684\u8BA4\u8BC1\u6E90\u7801\u4F4D\u7F6E\uFF0C\u4F7F\u7528\u6E90\u7801\u8BFB\u53D6\u5DE5\u5177\u8FD4\u56DE\u7684\u6587\u4EF6\u8DEF\u5F84\u548C\u884C\u53F7" }
|
|
3547
|
+
} };
|
|
3506
3548
|
function proposalParameters(port) {
|
|
3507
3549
|
return {
|
|
3508
3550
|
summary: { ...str, description: "\u4E2D\u6587\u6539\u9020\u6458\u8981\uFF1B\u4F7F\u7528\u7ED3\u6784\u5316\u53C2\u6570\u65F6\u5FC5\u586B" },
|
|
@@ -3579,11 +3621,15 @@ function proposalParameters(port) {
|
|
|
3579
3621
|
parameters: { ...objects, required: true },
|
|
3580
3622
|
request_body: { oneOf: [{ type: "null" }, object2], required: true },
|
|
3581
3623
|
responses: { ...object2, required: true },
|
|
3582
|
-
auth: { ...
|
|
3624
|
+
auth: { ...routeAuth, required: true },
|
|
3583
3625
|
effect: { ...text2, enum: ["read", "write", "destructive", "external"] },
|
|
3584
3626
|
confirmation_required: { ...bool, required: true }
|
|
3585
3627
|
} } },
|
|
3586
|
-
pages: {
|
|
3628
|
+
pages: {
|
|
3629
|
+
...objects,
|
|
3630
|
+
description: "\u626B\u63CF\u7ED3\u679C\u7531\u63D2\u4EF6\u5408\u5E76\uFF0C\u53EF\u4EE5\u4F20 [] \u6216\u53EA\u8865\u5145\u9700\u8981\u5B9A\u5236\u7684\u9875\u9762",
|
|
3631
|
+
items: { ...object2, properties: { auth: routeAuth } }
|
|
3632
|
+
},
|
|
3587
3633
|
verification: object2,
|
|
3588
3634
|
unresolved: strings
|
|
3589
3635
|
} },
|
|
@@ -3599,6 +3645,8 @@ function proposalParameters(port) {
|
|
|
3599
3645
|
}
|
|
3600
3646
|
|
|
3601
3647
|
// src/host/app-agent.ts
|
|
3648
|
+
var ANALYSIS_TIMEOUT_MS = 15 * 6e4;
|
|
3649
|
+
var REPLY_TIMEOUT_MS = 30 * 6e4;
|
|
3602
3650
|
function loadBundledSkillText(relativePath) {
|
|
3603
3651
|
const fromSrc = fileURLToPath2(new URL(`../../runtime/app_delivery/${relativePath}`, import.meta.url));
|
|
3604
3652
|
const fromLib = fileURLToPath2(new URL(`../runtime/app_delivery/${relativePath}`, import.meta.url));
|
|
@@ -3685,11 +3733,12 @@ ${contractDoc}
|
|
|
3685
3733
|
3. \u4FDD\u7559\u539F\u4E1A\u52A1\u884C\u4E3A\u3001\u8BA4\u8BC1\u3001\u6570\u636E\u5E93\u5F15\u64CE\u548C\u6570\u636E\u3002SQLite\u3001JSON\u3001\u4E0A\u4F20\u76EE\u5F55\u7B49\u672C\u5730\u6570\u636E\u91C7\u7528\u6301\u4E45\u5316\u5377\uFF08storage_mounts\uFF09\uFF0C\u7EDD\u4E0D\u81EA\u52A8\u6539\u5199\u9A71\u52A8\u8FC1\u5E93\u3002
|
|
3686
3734
|
4. \u63D0\u4F9B\u5B8C\u6574 Dockerfile\u30010.0.0.0 \u76D1\u542C\u548C\u540C\u4E00\u670D\u52A1\u7684 /healthz \u8FD4\u56DE {service:slug}\uFF0C\u5E76\u786E\u8BA4\u62DF\u63D0\u4EA4\u7684\u8FD0\u884C\u6E90\u7801\u91CC\u786E\u5B9E\u5305\u542B /healthz \u8DEF\u7531\u5904\u7406\uFF08\u5373\u4F7F\u539F\u5E94\u7528\u5DF2\u6709\u5176\u4ED6\u5065\u5EB7\u7AEF\u70B9\uFF1B\u4EC5\u4FEE\u6539 contract.health \u4E0D\u4F1A\u751F\u6210\u8DEF\u7531\uFF09\u3002\u6CBF\u7528\u5DF2\u786E\u8BA4\u7684 container_port\uFF0C\u4FDD\u7559\u539F\u542F\u52A8\u811A\u672C\u7684\u6267\u884C\u6743\u9650\u3002build_context \u5305\u542B\u5FC5\u8981\u6E90\u7801\uFF0C\u6392\u9664\u6784\u5EFA\u7F13\u5B58\u3002
|
|
3687
3735
|
5. \u6240\u6709\u5DF2\u6620\u5C04\u4E3A\u8FD0\u884C\u65F6\u73AF\u5883\u53D8\u91CF\u7684\u539F\u914D\u7F6E\u9879\uFF0C\u8BF7\u5C06 configs[].source \u8BBE\u4E3A read \u8FD4\u56DE\u7684 Original configuration references \u5143\u6570\u636E\u4E2D\u7684\u7CBE\u786E {"path":..., "keys":[...]} \u5F15\u7528\uFF08\u7CFB\u7EDF\u4F1A\u5728\u672C\u5730\u5B89\u5168\u4FDD\u7559\u539F\u503C\u5E76\u5728\u90E8\u7F72\u65F6\u6CE8\u5165\uFF0C\u4FEE\u6539\u914D\u7F6E\u6587\u4EF6\u65F6\u4E25\u7981\u4E22\u5931\u539F\u6709\u654F\u611F\u5B57\u6BB5\uFF09\u3002
|
|
3688
|
-
6. \u8BA4\u8BC1\u53EA\u4F7F\u7528\u8FD0\u884C\u914D\u7F6E\u7684\u73AF\u5883\u53D8\u91CF\u5F15\u7528\uFF08auth_profile / auth_profiles \u7684 username_env/password_env/token_env\uFF0C\u4EE5\u53CA auth_rules \u6709\u8BC1\u636E\u7684\u7EE7\u627F\u89C4\u5219\uFF09\uFF0C\u7EDD\u4E0D\u628A\u660E\u6587\u5BC6\u7801\u3001\u4EE4\u724C\u653E\u8FDB\u62A5\u544A\u3001\u5951\u7EA6\u6216\u6280\u80FD\u3002scanner \u7684 auth=unknown \u4EE3\u8868\u5C1A\u672A\u5206\u6790\uFF0C\u7EDD\u4E0D\u80FD\u5F53\u6210\u516C\u5F00\u63A5\u53E3\uFF1B\u8BFB\u53D6\u5B9E\u9645\u767B\u5F55\u3001\u4F1A\u8BDD\u4E0E\u89D2\u8272\u4EE3\u7801\uFF0C\
|
|
3736
|
+
6. \u8BA4\u8BC1\u53EA\u4F7F\u7528\u8FD0\u884C\u914D\u7F6E\u7684\u73AF\u5883\u53D8\u91CF\u5F15\u7528\uFF08auth_profile / auth_profiles \u7684 username_env/password_env/token_env\uFF0C\u4EE5\u53CA auth_rules \u6709\u8BC1\u636E\u7684\u7EE7\u627F\u89C4\u5219\uFF09\uFF0C\u7EDD\u4E0D\u628A\u660E\u6587\u5BC6\u7801\u3001\u4EE4\u724C\u653E\u8FDB\u62A5\u544A\u3001\u5951\u7EA6\u6216\u6280\u80FD\u3002scanner \u7684 auth=unknown \u4EE3\u8868\u5C1A\u672A\u5206\u6790\uFF0C\u7EDD\u4E0D\u80FD\u5F53\u6210\u516C\u5F00\u63A5\u53E3\uFF1B\u8BFB\u53D6\u5B9E\u9645\u767B\u5F55\u3001\u4F1A\u8BDD\u4E0E\u89D2\u8272\u4EE3\u7801\uFF0C\u9010\u5B57\u91C7\u7528 read \u8FD4\u56DE\u7684 path \u548C\u771F\u5B9E\u884C\u53F7\u3002\u8DEF\u5F84\u4E0D\u5B58\u5728\u65F6\u5148\u7528 inventory \u6216\u5DE5\u5177\u7ED9\u51FA\u7684\u540C\u540D\u5019\u9009\u91CD\u8BFB\u76F8\u5173\u6587\u4EF6\u3002\u5982\u679C\u67D0\u6587\u4EF6\u5DF2\u901A\u8FC7 opc_delivery_propose_file \u6682\u5B58\u4FEE\u6539\uFF0C\u8BF7\u7528 action=read \u4E14 proposed=true \u8BFB\u53D6\u62DF\u4EA4\u4ED8\u7248\u672C\u5E76\u5F15\u7528\u5176\u4E2D\u7684\u771F\u5B9E\u884C\u53F7\uFF1B\u82E5\u62DF\u4EA4\u4ED8\u6587\u4EF6\u9057\u6F0F\u4E86\u539F\u8BA4\u8BC1\u6216\u4E1A\u52A1\u5904\u7406\u51FD\u6570\uFF0C\u5148\u8865\u5168\u518D\u4FEE\u6B63\u5F15\u7528\u3002\u82E5\u8BC1\u636E\u65E0\u6548\uFF0C\u9488\u5BF9\u76F8\u5173\u6587\u4EF6\u91CD\u65B0\u8BFB\u53D6\u5E76\u4FEE\u6B63\u3002\u5E38\u89C4\u4E1A\u52A1\u9A8C\u8BC1\u6240\u9700\u8D26\u53F7\u3001\u5BC6\u7801\u6216\u4F1A\u8BDD\u5728\u90E8\u7F72\u540E\u586B\u5199\uFF0C\u53EA\u6709\u771F\u5B9E\u963B\u585E\u6539\u9020\u7684\u5916\u90E8\u6388\u6743\u6216\u89D2\u8272\u51B3\u5B9A\u624D\u5E26 auth_blockers \u63D0\u95EE\u3002
|
|
3689
3737
|
7. \u5BF9\u4E8E\u8981\u65B0\u589E\u6216\u4FEE\u6539\u7684\u6587\u4EF6\uFF0C\u4F18\u5148\u4F7F\u7528 opc_delivery_propose_file \u9010\u4E2A\u6682\u5B58\u5B8C\u6574\u6587\u4EF6\u5185\u5BB9\uFF0C\u7136\u540E\u5728 opc_delivery_submit \u7684\u7ED3\u6784\u5316 changes \u4E2D\u6309 {id, path, reason, group} \u5F15\u7528\u3002\u5C0F\u6539\u52A8\u53EF\u76F4\u63A5\u5728 changes \u4E2D\u63D0\u4F9B\u5B8C\u6574 content\u3002
|
|
3690
|
-
8.
|
|
3738
|
+
8. \u63D0\u4EA4\u65F6\u4F1A\u590D\u6838 build_context \u5185\u7684\u63A5\u53E3\u4E0E\u9875\u9762\u5E76\u5408\u5E76\u8FDB\u5951\u7EA6\u3002\u53EA\u7EB3\u5165\u5B9E\u9645\u90E8\u7F72\u5E94\u7528\u7684\u8DEF\u7531\uFF0C\u4E0D\u8981\u8865\u5165\u6D4B\u8BD5\u3001\u6837\u4F8B\u6216\u6F14\u793A\u670D\u52A1\u7684\u8DEF\u5F84\u3002\u4E25\u7981\u628A\u201C\u63A5\u53E3\u6570\u91CF\u591A/\u626B\u63CF\u622A\u65AD/\u6DFB\u52A0 healthz/\u521B\u5EFA Dockerfile\u201D\u7B49\u5185\u90E8\u6280\u672F\u52A8\u4F5C\u653E\u8FDB unresolved\u3002
|
|
3691
3739
|
9. verification.cases \u4E3A\u771F\u5B9E\u53EA\u8BFB\u4E1A\u52A1\u63A2\u9488\uFF08\u6BCF\u79CD\u53D7\u4FDD\u62A4\u8BA4\u8BC1\u8EAB\u4EFD\u5747\u9700\u8986\u76D6\uFF09\uFF0C\u4E0D\u80FD\u7F16\u9020\u4E1A\u52A1\u8BB0\u5F55\u6216\u4EE5\u5065\u5EB7\u63A2\u9488\u4EE3\u66FF\u3002
|
|
3692
|
-
10. \u6709\u9700\u8981\u7528\u6237\u51B3\u5B9A\u7684\u771F\u5B9E\u963B\u585E\uFF08\u5982\u5916\u90E8\u8FDE\u63A5\u66FF\u6362\u3001\u7F3A\u5931\u5916\u90E8\u6388\u6743\uFF09\u65F6\u63D0\u4EA4 unresolved\uFF0C\u5E76\u53EF\u5728 decisions \u4E2D\u63D0\u4F9B [{id, question, impact, options}]\uFF08\u6700\u591A 4 \u4E2A\u7B80\u77ED\u9009\u9879\uFF09\uFF1B\u6CA1\u6709\u963B\u585E\u65F6 unresolved \u8BBE\u4E3A\u7A7A\u6570\u7EC4 [] \u5E76\u63D0\u4EA4\u5B8C\u6574\u53EF\u6821\u9A8C\u63D0\u6848\u3002summary \u8BF7\u6309\u591A\u6BB5\u3010\u5E94\u7528\u5B9A\u4F4D\u3011\u3001\u3010\u8FD0\u884C\u73AF\u5883\u3011\u3001\u3010\u63A5\u53E3\u4E0E\u9875\u9762\u3011\u3001\u3010\u767B\u5F55\u4E0E\u9274\u6743\u3011\u3001\u3010\u6570\u636E\u4E0E\u5B58\u50A8\u3011\u3001\u3010\u6539\u9020\u4E0E\u6280\u80FD\u3011\u6E05\u6670\u6362\u884C\u6392\u7248\u3002\u5DE5\u5177\u6821\u9A8C\u5931\u8D25\u5E94\u4FEE\u6B63\u540E\u91CD\u63D0\uFF0C\u63D0\u4EA4\u6210\u529F\u540E\u7ED3\u675F\u672C\u8F6E\u3002
|
|
3740
|
+
10. \u6709\u9700\u8981\u7528\u6237\u51B3\u5B9A\u7684\u771F\u5B9E\u963B\u585E\uFF08\u5982\u5916\u90E8\u8FDE\u63A5\u66FF\u6362\u3001\u7F3A\u5931\u5916\u90E8\u6388\u6743\uFF09\u65F6\u63D0\u4EA4 unresolved\uFF0C\u5E76\u53EF\u5728 decisions \u4E2D\u63D0\u4F9B [{id, question, impact, options}]\uFF08\u6700\u591A 4 \u4E2A\u7B80\u77ED\u9009\u9879\uFF09\uFF1B\u6CA1\u6709\u963B\u585E\u65F6 unresolved \u8BBE\u4E3A\u7A7A\u6570\u7EC4 [] \u5E76\u63D0\u4EA4\u5B8C\u6574\u53EF\u6821\u9A8C\u63D0\u6848\u3002summary \u8BF7\u6309\u591A\u6BB5\u3010\u5E94\u7528\u5B9A\u4F4D\u3011\u3001\u3010\u8FD0\u884C\u73AF\u5883\u3011\u3001\u3010\u63A5\u53E3\u4E0E\u9875\u9762\u3011\u3001\u3010\u767B\u5F55\u4E0E\u9274\u6743\u3011\u3001\u3010\u6570\u636E\u4E0E\u5B58\u50A8\u3011\u3001\u3010\u6539\u9020\u4E0E\u6280\u80FD\u3011\u6E05\u6670\u6362\u884C\u6392\u7248\u3002\u5DE5\u5177\u6821\u9A8C\u5931\u8D25\u5E94\u4FEE\u6B63\u540E\u91CD\u63D0\uFF0C\u63D0\u4EA4\u6210\u529F\u540E\u7ED3\u675F\u672C\u8F6E\u3002
|
|
3741
|
+
11. \u5DE5\u5177\u786E\u8BA4\u6709\u5F85\u7B54\u95EE\u9898\u65F6\uFF0C\u7528\u666E\u901A\u5BF9\u8BDD\u9010\u9879\u5411\u7528\u6237\u63D0\u95EE\uFF0C\u5199\u6E05\u695A\u9009\u9879\u548C\u540E\u679C\uFF0C\u518D\u7ED3\u675F\u672C\u8F6E\u7B49\u5F85\u7528\u6237\u4ECE\u5F53\u524D\u4F1A\u8BDD\u56DE\u590D\u3002\u8BF7\u52FF\u7D22\u8981\u5BC6\u7801\u3001\u5BC6\u94A5\u6216\u4EE4\u724C\u3002\u6536\u5230\u8865\u5145\u6216\u7B54\u6848\u540E\uFF0C\u6CBF\u7528\u5F53\u524D\u4EFB\u52A1\u3001\u5DF2\u6709\u6682\u5B58\u6587\u4EF6\u4E0E\u5DF2\u626B\u63CF\u63A5\u53E3\uFF0C\u53EA\u4FEE\u8BA2\u6709\u5F71\u54CD\u7684\u90E8\u5206\u5E76\u91CD\u65B0\u63D0\u4EA4\u5B8C\u6574\u65B9\u6848\u3002\u7528\u6237\u53EA\u8BE2\u95EE\u8BF4\u660E\u65F6\uFF0C\u63D0\u4EA4\u65F6\u4FDD\u7559\u672A\u89E3\u51B3\u7684\u95EE\u9898\uFF0C\u5E76\u7528\u666E\u901A\u5BF9\u8BDD\u56DE\u7B54\u8BF4\u660E\u3002`;
|
|
3693
3742
|
if (isRepair) {
|
|
3694
3743
|
text3 += `
|
|
3695
3744
|
DEPLOYMENT REPAIR\uFF08\u90E8\u7F72/\u9A8C\u8BC1\u5931\u8D25\u4E13\u9879\u4FEE\u590D\uFF09\uFF1A\u5FC5\u987B\u5148\u8C03\u7528 opc_delivery_inspect \u7684 read_failed \u8BFB\u53D6\u4E0A\u6B21\u5B9E\u9645\u90E8\u7F72\u5305\u4E2D\u7684\u51FA\u9519\u6587\u4EF6\uFF0C\u5E76\u4E0E read \u539F\u6E90\u7801\u5BF9\u6BD4\u3002\u65E7\u4FEE\u6539\u53EF\u80FD\u662F\u9519\u8BEF\u7684\uFF0C\u4E0D\u80FD\u65E0\u4F9D\u636E\u590D\u7528\u65E7\u63D0\u6848\uFF1B\u9488\u5BF9\u8BED\u6CD5\u9519\u8BEF\u3001\u7F3A\u6A21\u5757\u6216\u542F\u52A8\u5931\u8D25\u5FC5\u987B\u4FEE\u6539\u5BF9\u5E94\u6587\u4EF6\u5E76\u63D0\u4EA4\u5B8C\u6574\u66FF\u6362\u5185\u5BB9\u3002`;
|
|
@@ -3712,7 +3761,17 @@ function attachAppAgent(ctx, delivery) {
|
|
|
3712
3761
|
\u672C\u4EFB\u52A1\u5BB9\u5668\u7AEF\u53E3\u5DF2\u9501\u5B9A\u4E3A ${port}\u3002\u6BCF\u6B21\u8C03\u7528 opc_delivery_submit \u90FD\u8981\u63D0\u4EA4\u5B8C\u6574\u5951\u7EA6\uFF0C\u5305\u62EC contract.runtime \u7684 language\u3001version \u548C\u6570\u5B57 port=${port}\u3002\u4FEE\u6B63\u5355\u4E2A\u5B57\u6BB5\u65F6\uFF0C\u5408\u5E76\u5230\u5B8C\u6574\u63D0\u6848\u540E\u518D\u63D0\u4EA4\u3002issues \u6BCF\u9879\u8981\u6709 id\u3001evidence\u3001impact\u3001recommendation\uFF1Bauth_rules \u6BCF\u9879\u8981\u6709 target=api/page\u3001path \u6216 prefix\u3001auth \u548C\u6E90\u7801\u4F4D\u7F6E\u6570\u7EC4 evidence\u3002\u63A5\u53E3\u548C\u9875\u9762\u53EF\u4EE5\u7528\u7A7A\u6570\u7EC4\u4EA4\u7ED9\u540E\u7AEF\u5408\u5E76\u3002\u5927\u6587\u4EF6\u5355\u72EC\u6682\u5B58\uFF0C\u6C47\u603B\u53EA\u5F15\u7528\u53D8\u66F4 ID\u3002`;
|
|
3713
3762
|
const prevPlan = compactPreviousPlan(job.proposal);
|
|
3714
3763
|
const taskInstruction = isRepair ? "\u90E8\u7F72\u5931\u8D25\u4E13\u9879\u4FEE\u590D\uFF1A\u8BFB\u53D6\u5B9E\u9645\u5931\u8D25\u5236\u54C1\u4E0E\u539F\u59CB\u6E90\u7801\uFF0C\u5BF9\u6BD4\u65E7\u4FEE\u6539\uFF0C\u4FEE\u590D\u6839\u56E0\u3002\u4E0D\u80FD\u628A\u672C\u8F6E\u5F53\u6210\u914D\u7F6E\u786E\u8BA4\uFF0C\u4E0D\u80FD\u65E0\u4F9D\u636E\u590D\u7528\u9519\u8BEF\u4EE3\u7801\u3002" : prevPlan && feedback.trim() ? "\u8FD9\u662F\u57FA\u4E8E\u4E0A\u4E00\u8F6E\u5206\u6790\u7ED3\u679C\uFF08previous_plan\uFF09\u7684\u7528\u6237\u786E\u8BA4/\u8865\u5145\u8F6E\u6B21\u3002\u4E0A\u4E00\u8F6E\u6682\u5B58\u7684\u6587\u4EF6\u4FEE\u6539\uFF08changes\uFF09\u5DF2\u9884\u8F7D\u5165\u6682\u5B58\u533A\uFF08\u672A\u6539\u52A8\u7684\u6587\u4EF6\u53EF\u76F4\u63A5\u6309\u539F id \u5F15\u7528\uFF0C\u65E0\u9700\u91CD\u590D\u8BFB\u53D6\u6E90\u7801\u6216\u91CD\u65B0\u8C03\u7528 propose_file\uFF09\uFF0C\u626B\u63CF\u7684\u5168\u90E8\u63A5\u53E3\u4E0E\u9875\u9762\u4E5F\u5DF2\u7531\u540E\u7AEF\u7F13\u5B58\u5E76\u81EA\u52A8\u5408\u5E76\u3002\u8BF7\u4EC5\u9488\u5BF9 user_answers \u8FDB\u884C\u5FC5\u8981\u7684\u589E\u91CF\u8C03\u6574\u5E76\u76F4\u63A5\u8C03\u7528 opc_delivery_submit\uFF08unresolved \u4EC5\u4FDD\u7559\u771F\u6B63\u963B\u585E\u6539\u9020\u7684\u4E8B\u9879\uFF09\u3002\u672C\u8F6E summary \u53EA\u9700\u7B80\u660E\u8BF4\u660E\u5DF2\u6309\u7528\u6237\u786E\u8BA4\u5B8C\u6210\u4E86\u54EA\u4E9B\u8C03\u6574\uFF0C\u4E25\u7981\u91CD\u590D\u8F93\u51FA\u5168\u91CF\u6478\u5E95\u5185\u5BB9\uFF01" : "\u5206\u6790\u5E94\u7528\u5E76\u63D0\u4EA4\u5B8C\u6574\u4FEE\u6539\u63D0\u6848\u548C\u4E1A\u52A1\u5951\u7EA6\u3002\u5148\u8C03\u7528 scan_routes_and_pages \u4E0E\u8BFB\u53D6\u6E90\u7801\u5DE5\u5177\u5168\u9762\u6478\u6E05\u5E94\u7528\uFF0C\u5B8C\u6574\u6536\u5F55\u6240\u6709\u9875\u9762\u4E0E\u6240\u6709\u63A5\u53E3\uFF0C\u6309\u56DB\u6B65\u89C4\u8303\u5206\u6BB5\u6E05\u6670\u8F93\u51FA\u5206\u6790\u4E0E\u6539\u9020\u65B9\u6848\u3002";
|
|
3715
|
-
const
|
|
3764
|
+
const timeout = new AbortController();
|
|
3765
|
+
const abort = AbortSignal.any([signal, timeout.signal]);
|
|
3766
|
+
let deadline;
|
|
3767
|
+
const setDeadline = (ms) => {
|
|
3768
|
+
clearTimeout(deadline);
|
|
3769
|
+
deadline = setTimeout(() => timeout.abort(new Error("AI \u5206\u6790\u8D85\u65F6\uFF0C\u539F\u6E90\u7801\u548C\u5DF2\u6709\u56DE\u7B54\u5DF2\u4FDD\u7559\u3002\u8BF7\u7EE7\u7EED\u51C6\u5907\u3002")), ms);
|
|
3770
|
+
deadline.unref();
|
|
3771
|
+
};
|
|
3772
|
+
let wakeReply;
|
|
3773
|
+
let replyCount = 0;
|
|
3774
|
+
const sessionReady = Promise.withResolvers();
|
|
3716
3775
|
const validationErrors = [];
|
|
3717
3776
|
const rejectedProposals = /* @__PURE__ */ new Set();
|
|
3718
3777
|
let repeatedProposal = false;
|
|
@@ -3731,6 +3790,27 @@ function attachAppAgent(ctx, delivery) {
|
|
|
3731
3790
|
setup(child) {
|
|
3732
3791
|
child.tools.restrict({ allow: [] });
|
|
3733
3792
|
child.systemPrompt.section({ name: "opc-delivery", order: 1, text: instructions, complete: true, interpolate: false });
|
|
3793
|
+
child.on("agent/pre-step", async ({ signal: turnSignal }, next) => {
|
|
3794
|
+
const decision = await next();
|
|
3795
|
+
if (decision.kind !== "enter" || !decision.messages.length) return decision;
|
|
3796
|
+
const messages = [];
|
|
3797
|
+
for (const message of decision.messages) {
|
|
3798
|
+
if (message.source.kind !== "user" || !("rpcId" in message.source)) {
|
|
3799
|
+
messages.push(message);
|
|
3800
|
+
continue;
|
|
3801
|
+
}
|
|
3802
|
+
const text3 = message.content.flatMap((part) => part.type === "text" ? [part.text] : []).join("\n").trim();
|
|
3803
|
+
if (!text3 || !await sessionReady.promise) continue;
|
|
3804
|
+
const safeText = await delivery.recordAnalysisReply(job, root, text3, AbortSignal.any([abort, turnSignal]));
|
|
3805
|
+
validationErrors.length = 0;
|
|
3806
|
+
rejectedProposals.clear();
|
|
3807
|
+
repeatedProposal = false;
|
|
3808
|
+
replyCount++;
|
|
3809
|
+
messages.push({ ...message, content: [{ type: "text", text: safeText }] });
|
|
3810
|
+
wakeReply?.();
|
|
3811
|
+
}
|
|
3812
|
+
return messages.length ? { ...decision, messages } : { kind: "reject" };
|
|
3813
|
+
});
|
|
3734
3814
|
const output = { schema: { type: "string" }, render: (_, value) => [{ type: "text", text: value }] };
|
|
3735
3815
|
child.tools.register(defineTool2({
|
|
3736
3816
|
name: "opc_delivery_inspect",
|
|
@@ -3833,7 +3913,9 @@ function attachAppAgent(ctx, delivery) {
|
|
|
3833
3913
|
if (validationErrors.length === 6) cancel();
|
|
3834
3914
|
throw new Error(detail);
|
|
3835
3915
|
}
|
|
3836
|
-
|
|
3916
|
+
const questions = analysisQuestions(job.proposal);
|
|
3917
|
+
return questions.length ? `\u65B9\u6848\u5DF2\u4FDD\u5B58\uFF0C\u7B49\u5F85\u7528\u6237\u56DE\u590D\u3002\u8BF7\u5728\u5F53\u524D\u5BF9\u8BDD\u4E2D\u5217\u51FA\u5F85\u786E\u8BA4\u7684\u95EE\u9898\u4E0E\u53EF\u9009\u65B9\u6848\uFF0C\u518D\u7ED3\u675F\u672C\u8F6E\uFF1A
|
|
3918
|
+
${questions.join("\n")}` : "\u5B8C\u6574\u65B9\u6848\u5DF2\u901A\u8FC7\u6821\u9A8C\u3002\u8BF7\u7B80\u8981\u8BF4\u660E\u7ED3\u679C\u5E76\u7ED3\u675F\u672C\u8F6E\uFF0COPC \u5C06\u81EA\u52A8\u751F\u6210\u4EA4\u4ED8\u5305\u3002";
|
|
3837
3919
|
}
|
|
3838
3920
|
}));
|
|
3839
3921
|
}
|
|
@@ -3859,11 +3941,17 @@ function attachAppAgent(ctx, delivery) {
|
|
|
3859
3941
|
const reason = event.data.reason;
|
|
3860
3942
|
turnOutcome.failure = reason.kind === "error" ? reason.error : void 0;
|
|
3861
3943
|
turnOutcome.truncated = reason.kind === "max-tokens";
|
|
3944
|
+
turnOutcome.stopped = reason.kind === "aborted" && reason.reason.kind === "user";
|
|
3862
3945
|
});
|
|
3863
3946
|
const cancel = () => {
|
|
3864
3947
|
analysis.agent.cancel({ kind: "user" });
|
|
3865
3948
|
};
|
|
3866
|
-
|
|
3949
|
+
const onAbort = () => {
|
|
3950
|
+
sessionReady.resolve(false);
|
|
3951
|
+
cancel();
|
|
3952
|
+
wakeReply?.();
|
|
3953
|
+
};
|
|
3954
|
+
abort.addEventListener("abort", onAbort, { once: true });
|
|
3867
3955
|
const send = (text3) => {
|
|
3868
3956
|
analysis.agent.followup({
|
|
3869
3957
|
id: randomUUID5(),
|
|
@@ -3877,8 +3965,7 @@ function attachAppAgent(ctx, delivery) {
|
|
|
3877
3965
|
};
|
|
3878
3966
|
try {
|
|
3879
3967
|
abort.throwIfAborted();
|
|
3880
|
-
|
|
3881
|
-
abort.throwIfAborted();
|
|
3968
|
+
setDeadline(ANALYSIS_TIMEOUT_MS);
|
|
3882
3969
|
const previous = job.published ? await delivery.platform("/" + job.slug, appCtxId).catch(() => void 0) : void 0;
|
|
3883
3970
|
const runtimeLogs = job.published ? await delivery.platform("/" + job.slug + "/logs", appCtxId).catch(() => void 0) : void 0;
|
|
3884
3971
|
const rawResources = await delivery.platform("/resources", appCtxId).catch(() => ({ resources: [] }));
|
|
@@ -3888,7 +3975,7 @@ function attachAppAgent(ctx, delivery) {
|
|
|
3888
3975
|
resources: rawResources?.resources ?? [],
|
|
3889
3976
|
slug: job.slug,
|
|
3890
3977
|
default_only: true
|
|
3891
|
-
},
|
|
3978
|
+
}, abort).catch(() => ({ resources: [] }));
|
|
3892
3979
|
if (isRepair || previous?.error_message || previous?.build_log || runtimeLogs?.runtime_logs) {
|
|
3893
3980
|
const mergedFailure = [
|
|
3894
3981
|
job.failureContext,
|
|
@@ -3897,11 +3984,12 @@ function attachAppAgent(ctx, delivery) {
|
|
|
3897
3984
|
runtimeLogs?.runtime_logs?.slice(-4e3)
|
|
3898
3985
|
].filter(Boolean).join("\n");
|
|
3899
3986
|
if (mergedFailure) {
|
|
3900
|
-
job.failureContext = await worker({ action: "redact_feedback", root, text: mergedFailure.slice(-24e3) },
|
|
3987
|
+
job.failureContext = await worker({ action: "redact_feedback", root, text: mergedFailure.slice(-24e3) }, abort);
|
|
3901
3988
|
}
|
|
3902
3989
|
}
|
|
3903
3990
|
abort.throwIfAborted();
|
|
3904
|
-
|
|
3991
|
+
const waitingForReply = job.status === "review" && analysisQuestions(job.proposal).length > 0;
|
|
3992
|
+
const taskContext = JSON.stringify({
|
|
3905
3993
|
name: job.name,
|
|
3906
3994
|
description: job.description ?? "",
|
|
3907
3995
|
slug: job.slug,
|
|
@@ -3916,25 +4004,56 @@ function attachAppAgent(ctx, delivery) {
|
|
|
3916
4004
|
previous_plan: prevPlan,
|
|
3917
4005
|
failed_snapshot: job.failedSnapshot,
|
|
3918
4006
|
failure_log: job.failureContext ?? "",
|
|
3919
|
-
task: taskInstruction
|
|
4007
|
+
task: waitingForReply ? "\u8BF7\u7ED3\u5408 previous_plan \u4E2D\u7684\u5F85\u786E\u8BA4\u4E8B\u9879\u5904\u7406\u63A5\u4E0B\u6765\u6536\u5230\u7684\u7528\u6237\u56DE\u590D\u3002" : taskInstruction
|
|
3920
4008
|
});
|
|
3921
|
-
|
|
4009
|
+
analysis.agent.inject({
|
|
4010
|
+
id: randomUUID5(),
|
|
4011
|
+
role: "user",
|
|
4012
|
+
source: { kind: "opc-app-delivery", form: "notice", summary: "OPC \u5E94\u7528\u6539\u9020\u4EFB\u52A1\u5DF2\u8F7D\u5165" },
|
|
4013
|
+
content: [{ type: "text", text: taskContext }]
|
|
4014
|
+
});
|
|
4015
|
+
await onSessionReady(String(analysis.agent.session.id));
|
|
4016
|
+
sessionReady.resolve(true);
|
|
4017
|
+
let prompt = "\u8BF7\u5F00\u59CB\u51C6\u5907\u5E94\u7528\u3002";
|
|
4018
|
+
for (let attempt = 0; ; attempt++) {
|
|
3922
4019
|
turnOutcome.failure = void 0;
|
|
3923
4020
|
turnOutcome.truncated = false;
|
|
4021
|
+
turnOutcome.stopped = false;
|
|
4022
|
+
const repliesBeforeTurn = replyCount;
|
|
3924
4023
|
let errorMessage = "";
|
|
3925
4024
|
try {
|
|
3926
|
-
|
|
4025
|
+
if (job.status === "review") {
|
|
4026
|
+
if (!analysisQuestions(job.proposal).length) return;
|
|
4027
|
+
setDeadline(REPLY_TIMEOUT_MS);
|
|
4028
|
+
if (!abort.aborted) await new Promise((resolve) => {
|
|
4029
|
+
wakeReply = resolve;
|
|
4030
|
+
});
|
|
4031
|
+
wakeReply = void 0;
|
|
4032
|
+
signal.throwIfAborted();
|
|
4033
|
+
if (abort.aborted && replyCount === repliesBeforeTurn) return;
|
|
4034
|
+
abort.throwIfAborted();
|
|
4035
|
+
setDeadline(ANALYSIS_TIMEOUT_MS);
|
|
4036
|
+
} else {
|
|
4037
|
+
abort.throwIfAborted();
|
|
4038
|
+
send(prompt);
|
|
4039
|
+
}
|
|
3927
4040
|
await analysis.agent.whenIdle();
|
|
3928
4041
|
} catch (err) {
|
|
3929
4042
|
if (signal.aborted || abort.aborted && !repeatedProposal) throw err;
|
|
3930
4043
|
errorMessage = err instanceof Error ? err.message : String(err);
|
|
3931
4044
|
}
|
|
3932
|
-
if (job.status === "review")
|
|
4045
|
+
if (job.status === "review") {
|
|
4046
|
+
if (!analysisQuestions(job.proposal).length) return;
|
|
4047
|
+
attempt = -1;
|
|
4048
|
+
continue;
|
|
4049
|
+
}
|
|
3933
4050
|
if (repeatedProposal || validationErrors.length >= 6) {
|
|
3934
4051
|
throw new Error(validationErrors.at(-1) ?? "\u6280\u672F\u65B9\u6848\u8FDE\u7EED\u6821\u9A8C\u672A\u901A\u8FC7\uFF0C\u5DF2\u505C\u6B62\u81EA\u52A8\u91CD\u8BD5");
|
|
3935
4052
|
}
|
|
3936
4053
|
abort.throwIfAborted();
|
|
3937
|
-
const { failure, truncated } = getTurnOutcome();
|
|
4054
|
+
const { failure, truncated, stopped } = getTurnOutcome();
|
|
4055
|
+
if (stopped) throw new Error("\u5DF2\u505C\u6B62 AI \u5206\u6790\uFF0C\u539F\u6E90\u7801\u548C\u5DF2\u6709\u56DE\u7B54\u5DF2\u4FDD\u7559\u3002");
|
|
4056
|
+
if (replyCount !== repliesBeforeTurn) attempt = 0;
|
|
3938
4057
|
const providerMessage = failure?.message ?? errorMessage;
|
|
3939
4058
|
const badToolJson = /tool input is invalid JSON/i.test(providerMessage);
|
|
3940
4059
|
const invalidOutput = badToolJson || truncated;
|
|
@@ -3956,8 +4075,10 @@ function attachAppAgent(ctx, delivery) {
|
|
|
3956
4075
|
prompt = `\u7EE7\u7EED\u5F53\u524D\u4EFB\u52A1\uFF0C\u4FDD\u7559\u539F\u4E1A\u52A1\u548C\u7528\u6237\u9009\u62E9\u3002\u5F85\u5904\u7406\u7684\u6280\u672F\u53CD\u9988\uFF1A${reason}\u3002\u53EA\u4FEE\u6B63\u672A\u901A\u8FC7\u7684\u5B57\u6BB5\uFF0C\u518D\u63D0\u4EA4\u5B8C\u6574\u5951\u7EA6\uFF0C\u5FC5\u987B\u4FDD\u7559 runtime \u5E76\u586B\u5199\u6570\u5B57 port=${port}\u3002\u5927\u6587\u4EF6\u5148\u5355\u72EC\u6682\u5B58\uFF0Cchanges \u53EA\u4F20 ID\u3001\u8DEF\u5F84\u548C\u7406\u7531\uFF1Bapis/pages \u53EA\u4F20\u5B9A\u5236\u9879\uFF0C\u5176\u4F59\u8BA9\u540E\u7AEF\u5408\u5E76\u3002\u7528\u7ED3\u6784\u5316\u53C2\u6570\u8C03\u7528 opc_delivery_submit\uFF0C\u4E0D\u8981\u5728\u4E00\u4E2A\u5B57\u7B26\u4E32\u4E2D\u5D4C\u5957\u6574\u4EFD JSON\u3002`;
|
|
3957
4076
|
}
|
|
3958
4077
|
} finally {
|
|
4078
|
+
sessionReady.resolve(false);
|
|
4079
|
+
clearTimeout(deadline);
|
|
3959
4080
|
stopObserving();
|
|
3960
|
-
abort.removeEventListener("abort",
|
|
4081
|
+
abort.removeEventListener("abort", onAbort);
|
|
3961
4082
|
await analysis.dispose();
|
|
3962
4083
|
}
|
|
3963
4084
|
};
|
package/package.json
CHANGED
|
@@ -25,7 +25,7 @@ Dockerfile 保持真实入口、运行时版本、依赖和资产,服务监听
|
|
|
25
25
|
|
|
26
26
|
## 认证与技能
|
|
27
27
|
|
|
28
|
-
保留认证,不提取明文密码给模型,不宣称哈希可解密。契约与技能只记录凭据环境变量引用;凭据通过客户端受保护输入提供。先沿实际登录入口、会话读取和角色检查确认认证方式。账号密码登录后若应用通过 Set-Cookie 发会话,业务接口按 Cookie
|
|
28
|
+
保留认证,不提取明文密码给模型,不宣称哈希可解密。契约与技能只记录凭据环境变量引用;凭据通过客户端受保护输入提供。先沿实际登录入口、会话读取和角色检查确认认证方式。账号密码登录后若应用通过 Set-Cookie 发会话,业务接口按 Cookie 认证。只为运行入口加载的真实路由编写规则,跳过测试夹具、样例和仅供演示的服务。证据使用源码读取工具返回的完整路径和实际行号。遇到路径错误,先查源码文件清单或读取候选文件,确认路径后再修正。
|
|
29
29
|
|
|
30
30
|
已有登录方式缺少账号、密码或会话时,照常完成改造和打包,在部署后的业务验证页填写对应凭据。只有必须由用户决定的外部授权或角色变更才列为改造待确认事项,附源码证据、受影响能力和具体操作。业务权限由应用检查;写入/破坏性/外部操作需确认。
|
|
31
31
|
|
|
@@ -52,6 +52,7 @@ Work 自动技术准备记录 `kind: ai-technical`、`scope: deployment-adaptati
|
|
|
52
52
|
- apis/pages 均显式填写数组并完整收录应用内全部后端接口与全部前端页面/业务视图(不得遗漏任何路由或子面板);至少一个非空。纯页面应用无需伪造 API,但必须提供浏览器验证计划。
|
|
53
53
|
- 每个 API 必须含 purpose、源码 evidence、实际 parameters/request_body/responses、auth、effect。request_body 为 null 或包含 required、description、schema 的对象;完整 schema 与错误说明应保留,工具不声称完整实现 JSON Schema 验证。API 错误可能包含 HTTP 200 下的业务错误码,业务流程必须明确成功判断,不把 HTTP 成功等同业务成功。
|
|
54
54
|
- auth.type 为 none、bearer 或 header;非 none 必须声明 env 环境变量名或引用 auth_profiles 中的 profile,header 还要提供 header。只允许运行时凭据环境变量引用;禁止将明文密码或固定令牌放进契约、技能或模型输出。
|
|
55
|
+
- 直接在 API 或页面上声明认证时,用 `auth.evidence` 引用登录、会话或权限代码。共用中间件的证据写在 `auth_rules[].evidence`。每条证据使用读取工具返回的相对路径与实际行号,修改过的文件以拟交付版本为准。
|
|
55
56
|
- 账号密码换会话可用 `auth_profiles.account = {"login_url":"/api/session","username_env":"APP_USER","password_env":"APP_PASSWORD"}`,受保护 API 使用 `{"type":"header","header":"Cookie","profile":"account"}`。这两个环境变量是业务验证输入,无需加入容器配置。读取真实会话与权限检查后引用 `文件:行号`,不能沿用其他源码版本的行号。
|
|
56
57
|
- 非只读 effect 必须 confirmation_required:true。不能仅按 HTTP 方法判断,POST 搜索也可以明确标为 read;GET 也可能需要确认。
|
|
57
58
|
- pages 每项含 path、purpose、evidence、actions;无页面就填空数组,浏览器操作需要调用方提供浏览器工具。
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
"""Deterministic application delivery helpers; analysis and source edits belong to the Agent."""
|
|
3
3
|
|
|
4
4
|
import argparse
|
|
5
|
+
from glob import escape as escape_glob
|
|
5
6
|
import hashlib
|
|
6
7
|
import io
|
|
7
8
|
import json
|
|
@@ -15,6 +16,7 @@ import sys
|
|
|
15
16
|
import tarfile
|
|
16
17
|
import tempfile
|
|
17
18
|
import time
|
|
19
|
+
import unicodedata
|
|
18
20
|
import urllib.error
|
|
19
21
|
import urllib.parse
|
|
20
22
|
import urllib.request
|
|
@@ -29,7 +31,7 @@ OWNER = "opc-app-adapter"
|
|
|
29
31
|
LABEL = "com.opc.app-adapter.run"
|
|
30
32
|
ENV_NAME = re.compile(r"^[A-Za-z_][A-Za-z0-9_]*$")
|
|
31
33
|
SLUG = re.compile(r"^[a-z][a-z0-9]*(?:-[a-z0-9]+)*$")
|
|
32
|
-
EXCLUDED = {".git", ".svn", ".hg", "node_modules", ".venv", "venv", "__pycache__", ".idea", "__MACOSX", ".DS_Store"}
|
|
34
|
+
EXCLUDED = {".git", ".svn", ".hg", ".claude", "node_modules", ".venv", "venv", "__pycache__", ".idea", "__MACOSX", ".DS_Store"}
|
|
33
35
|
# SQLite engine automatically generates transient WAL/SHM files during readonly inspections
|
|
34
36
|
TRANSIENT_FILE_SUFFIXES = {".sqlite-shm", ".sqlite-wal", ".sqlite3-shm", ".sqlite3-wal", ".db-shm", ".db-wal"}
|
|
35
37
|
SECRET_KEY = r"(?:password|passwd|pwd|secret|api[_-]?key|access[_-]?key(?:id|secret)?|client[_-]?secret|token|dsn|connectionstring)"
|
|
@@ -69,6 +71,20 @@ def relative(root, name):
|
|
|
69
71
|
return result
|
|
70
72
|
|
|
71
73
|
|
|
74
|
+
def source_path_hint(root, name):
|
|
75
|
+
basename = PurePosixPath(name).name
|
|
76
|
+
if not basename:
|
|
77
|
+
return "。请先用 inventory 查询并复制实际路径"
|
|
78
|
+
matches = []
|
|
79
|
+
for path in root.rglob(escape_glob(basename)):
|
|
80
|
+
if path.is_file() and path.name == basename and not path.is_symlink():
|
|
81
|
+
matches.append(path.relative_to(root).as_posix())
|
|
82
|
+
if not matches:
|
|
83
|
+
return "。请先用 inventory 查询并复制实际路径"
|
|
84
|
+
shown = "、".join(sorted(matches)[:3])
|
|
85
|
+
return f"。源码中的同名文件:{shown}。请核对并复制实际路径"
|
|
86
|
+
|
|
87
|
+
|
|
72
88
|
def valid_url(value):
|
|
73
89
|
return valid_origin(value)
|
|
74
90
|
|
|
@@ -147,6 +163,20 @@ def inspect_source(source):
|
|
|
147
163
|
return files, findings
|
|
148
164
|
|
|
149
165
|
|
|
166
|
+
def zip_member_path(member):
|
|
167
|
+
name = member.orig_filename
|
|
168
|
+
require("\0" not in name, "ZIP entry name contains a null byte")
|
|
169
|
+
if not (member.flag_bits & 0x800) and not name.isascii():
|
|
170
|
+
# Some writers store UTF-8 names without setting the UTF-8 flag.
|
|
171
|
+
# zipfile has already decoded unflagged names as CP437. Keep that
|
|
172
|
+
# decoding when the original bytes do not form valid UTF-8.
|
|
173
|
+
try:
|
|
174
|
+
return name.encode("cp437").decode("utf-8")
|
|
175
|
+
except UnicodeError:
|
|
176
|
+
pass
|
|
177
|
+
return name
|
|
178
|
+
|
|
179
|
+
|
|
150
180
|
def prepare(args):
|
|
151
181
|
work = Path(args.work_dir).resolve()
|
|
152
182
|
require(not work.exists(), "work directory already exists; choose a fresh directory")
|
|
@@ -195,19 +225,21 @@ def prepare(args):
|
|
|
195
225
|
source = work / "source"
|
|
196
226
|
# Validate the entire archive before creating files.
|
|
197
227
|
names = set()
|
|
198
|
-
for member in members
|
|
199
|
-
|
|
228
|
+
entries = [(member, zip_member_path(member)) for member in members]
|
|
229
|
+
for member, name in entries:
|
|
230
|
+
relative(source, name)
|
|
200
231
|
mode = member.external_attr >> 16
|
|
201
232
|
require(not stat.S_ISLNK(mode), "archive symlinks are not allowed")
|
|
202
|
-
|
|
203
|
-
names
|
|
233
|
+
canonical = unicodedata.normalize("NFC", PurePosixPath(name).as_posix())
|
|
234
|
+
require(canonical not in names, "duplicate ZIP entry")
|
|
235
|
+
names.add(canonical)
|
|
204
236
|
work.mkdir(parents=True, mode=0o700)
|
|
205
237
|
source.mkdir()
|
|
206
238
|
try:
|
|
207
|
-
for member in
|
|
208
|
-
if any(p in EXCLUDED for p in PurePosixPath(
|
|
239
|
+
for member, name in entries:
|
|
240
|
+
if any(p in EXCLUDED for p in PurePosixPath(name).parts):
|
|
209
241
|
continue
|
|
210
|
-
target = relative(source,
|
|
242
|
+
target = relative(source, name)
|
|
211
243
|
if member.is_dir():
|
|
212
244
|
target.mkdir(parents=True, exist_ok=True)
|
|
213
245
|
else:
|