dsh-plugin-opc 0.1.32 → 0.1.33

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 CHANGED
@@ -30286,7 +30286,7 @@ function mergeJobConfigs(job, draft, fallbackPort = 8080) {
30286
30286
  return {
30287
30287
  ...c,
30288
30288
  value: String(effectivePort),
30289
- original_value: origVal ?? (appDefault || String(effectivePort)),
30289
+ original_value: origVal ?? "",
30290
30290
  app_default: appDefault,
30291
30291
  secret: false,
30292
30292
  has_value: true,
@@ -30381,7 +30381,7 @@ function mergeJobConfigs(job, draft, fallbackPort = 8080) {
30381
30381
  };
30382
30382
  });
30383
30383
  for (const extra of rowMap.values()) {
30384
- if (!extra.key) continue;
30384
+ if (!extra.key || extra.key.trim() === "PORT") continue;
30385
30385
  merged.push({
30386
30386
  key: extra.key,
30387
30387
  value: extra.resource_id ? "" : extra.value ?? "",
@@ -30528,7 +30528,6 @@ function AppDeliveryConfig({
30528
30528
  onChange,
30529
30529
  compact = false,
30530
30530
  lockedPort,
30531
- onReturnToPortStep,
30532
30531
  readOnly = false
30533
30532
  }) {
30534
30533
  const [revealed, setRevealed] = (0, import_react5.useState)({});
@@ -30676,7 +30675,7 @@ function AppDeliveryConfig({
30676
30675
  value: portValue,
30677
30676
  className: "oa-input oa-mono oa-cfg-readonly"
30678
30677
  }
30679
- ), onReturnToPortStep && !readOnly && /* @__PURE__ */ import_react5.default.createElement("button", { type: "button", className: "oa-btn oa-btn-xs", onClick: onReturnToPortStep }, "\u8FD4\u56DE\u8C03\u6574\u7AEF\u53E3")) : selected ? /* @__PURE__ */ import_react5.default.createElement(
30678
+ )) : selected ? /* @__PURE__ */ import_react5.default.createElement(
30680
30679
  "input",
30681
30680
  {
30682
30681
  "aria-label": `${item.key} \u914D\u7F6E\u503C`,
@@ -58104,7 +58103,6 @@ function AppsPanel({
58104
58103
  originals: originalConfigs,
58105
58104
  resources,
58106
58105
  lockedPort: wizardJob.port ?? opcConfig.defaultPort,
58107
- onReturnToPortStep: () => void handleReturnToReview(),
58108
58106
  onChange: handleStep3ConfigsChange
58109
58107
  }
58110
58108
  ), /* @__PURE__ */ import_react8.default.createElement("details", { className: "oa-subcard oa-cfg-ref-details" }, /* @__PURE__ */ import_react8.default.createElement("summary", null, /* @__PURE__ */ import_react8.default.createElement("span", null, "\u67E5\u770B\u539F\u9879\u76EE\u914D\u7F6E\u6587\u4EF6\u53C2\u8003", sourceConfiguration?.files?.length ? `\uFF08${sourceConfiguration.files.length} \u4E2A\u6587\u4EF6\uFF09` : ""), /* @__PURE__ */ import_react8.default.createElement("span", { className: "oa-hint" }, "\u4EC5\u53EA\u8BFB\u53C2\u8003\uFF1B\u5B8C\u6574\u6E90\u6587\u4EF6\u9700\u5728\u672C\u5730\u7F16\u8F91\u540E\u91CD\u65B0\u5BFC\u5165")), !sourceConfiguration ? /* @__PURE__ */ import_react8.default.createElement("p", { className: "oa-hint", style: { margin: "8px 0 0" } }, "\u6682\u65F6\u65E0\u6CD5\u8BFB\u53D6\u539F\u5E94\u7528\u914D\u7F6E\u6587\u4EF6\u3002") : /* @__PURE__ */ import_react8.default.createElement("div", { style: { display: "flex", flexDirection: "column", gap: 6, marginTop: 4 } }, sourceConfiguration.files.map((file2) => /* @__PURE__ */ import_react8.default.createElement("details", { key: file2.path, className: "oa-cfg-ref-file" }, /* @__PURE__ */ import_react8.default.createElement("summary", null, /* @__PURE__ */ import_react8.default.createElement("code", null, file2.path), file2.is_example && /* @__PURE__ */ import_react8.default.createElement("span", { className: "oa-pill" }, "\u793A\u4F8B\u6A21\u677F"), /* @__PURE__ */ import_react8.default.createElement("span", { className: "oa-hint" }, file2.fields.length, " \u9879")), file2.fields.length > 0 && /* @__PURE__ */ import_react8.default.createElement("dl", { className: "oa-cfg-ref-dl" }, file2.fields.map(({ key, value }, index3) => /* @__PURE__ */ import_react8.default.createElement(import_react8.default.Fragment, { key: `${key}-${index3}` }, /* @__PURE__ */ import_react8.default.createElement("dt", null, /* @__PURE__ */ import_react8.default.createElement("code", null, key)), /* @__PURE__ */ import_react8.default.createElement("dd", null, /* @__PURE__ */ import_react8.default.createElement("code", null, value === "[REDACTED]" ? "\u654F\u611F\u503C\u5DF2\u9690\u85CF" : value || "\uFF08\u7A7A\uFF09"))))))), sourceConfiguration.references.length > 0 && /* @__PURE__ */ import_react8.default.createElement("div", { className: "oa-cfg-ref-file" }, /* @__PURE__ */ import_react8.default.createElement("div", { className: "oa-hint", style: { fontWeight: 600, marginBottom: 4 } }, "\u6E90\u7801\u5F15\u7528\u7684\u73AF\u5883\u53D8\u91CF"), /* @__PURE__ */ import_react8.default.createElement("div", { style: { display: "flex", flexWrap: "wrap", gap: 6 } }, sourceConfiguration.references.map((key) => /* @__PURE__ */ import_react8.default.createElement("code", { key, className: "oa-code" }, key)))), !sourceConfiguration.files.length && !sourceConfiguration.references.length && /* @__PURE__ */ import_react8.default.createElement("p", { className: "oa-hint", style: { margin: "6px 0 0" } }, "\u5728\u5BFC\u5165\u7684\u6E90\u7801\u4E2D\u672A\u8BC6\u522B\u5230\u914D\u7F6E\u6587\u4EF6\u6216\u73AF\u5883\u53D8\u91CF\u5F15\u7528\u3002")))), configSubTab === "mounts" && /* @__PURE__ */ import_react8.default.createElement("div", { className: "oa-form-card" }, volumeMounts.length === 0 ? /* @__PURE__ */ import_react8.default.createElement("div", { className: "oa-hint" }, "\u6B64\u5E94\u7528\u6CA1\u6709\u76EE\u5F55\u6302\u8F7D\u3002") : /* @__PURE__ */ import_react8.default.createElement("div", { className: "oa-subcard" }, /* @__PURE__ */ import_react8.default.createElement("div", { className: "oa-subcard-head" }, /* @__PURE__ */ import_react8.default.createElement("span", null, "\u6301\u4E45\u5316\u76EE\u5F55\u4E0E\u5B58\u50A8\u8D44\u6E90"), /* @__PURE__ */ import_react8.default.createElement("span", { className: "oa-pill oa-pill-ok" }, volumeMounts.length, " \u9879")), /* @__PURE__ */ import_react8.default.createElement("div", { style: { display: "flex", flexDirection: "column", gap: 10 } }, volumeMounts.map((mount) => {
package/lib/index.js CHANGED
@@ -3474,6 +3474,7 @@ ${trimmedFeedback}` : trimmedFeedback || prevFailure).slice(-24e3);
3474
3474
  root,
3475
3475
  proposal,
3476
3476
  allow_unresolved: hasQuestions || adminAccountPending,
3477
+ reuse_source_admin: !job.upgrade && !job.published && !adminReply && !canReusePrevious,
3477
3478
  admin_reply: adminReply,
3478
3479
  previous_skill_markdown: canReusePrevious ? job.skillMarkdown : void 0,
3479
3480
  repair: Boolean(job.failedRevision),
@@ -3490,7 +3491,7 @@ ${trimmedFeedback}` : trimmedFeedback || prevFailure).slice(-24e3);
3490
3491
  if (job.portAuto && Number.isInteger(validatedPort) && validatedPort >= 1 && validatedPort <= 65535) {
3491
3492
  job.port = validatedPort;
3492
3493
  }
3493
- if (adminAccountPending) job.proposal.adminAccountPending = true;
3494
+ if (adminAccountPending && !job.proposal.contract.admin_account?.source) job.proposal.adminAccountPending = true;
3494
3495
  else delete job.proposal.adminAccountPending;
3495
3496
  job.discoveryReport = validated?.discovery_report ?? job.discoveryReport;
3496
3497
  job.transformationReport = validated?.transformation_report ?? job.transformationReport;
@@ -4451,12 +4452,12 @@ function proposalParameters(port, portLocked = true) {
4451
4452
  login_method: str,
4452
4453
  token_json_path: str
4453
4454
  } },
4454
- auth_profiles: { ...object2, description: "\u6309 ID \u4FDD\u5B58\u767B\u5F55\u65B9\u5F0F\uFF0C\u63A5\u53E3\u901A\u8FC7 auth.profile \u5F15\u7528" },
4455
+ auth_profiles: { ...object2, description: '\u6309 ID \u4FDD\u5B58\u767B\u5F55\u65B9\u5F0F\u3002\u4F8B\uFF1A{"account":{"login_url":"/api/session","login_method":"POST","username_env":"APP_USER","password_env":"APP_PASSWORD"}}\u3002profile ID \u53EA\u51FA\u73B0\u4E00\u5C42\uFF0C\u63A5\u53E3\u901A\u8FC7 auth.profile \u5F15\u7528\u3002' },
4455
4456
  admin_account: { ...object2, description: "\u6309\u5E94\u7528\u6E90\u7801\u8BC1\u636E\u9009\u62E9 existing \u6216 create\u3002\u4EC5\u63CF\u8FF0\u8D26\u53F7\u6765\u6E90\u6216\u5199\u5165\u4F4D\u7F6E\uFF0C\u4E0D\u63D0\u4EA4\u5B9E\u9645\u8D26\u5BC6\u3002", properties: {
4456
4457
  mode: { ...text2, enum: ["existing", "create"] },
4457
4458
  profile: text2,
4458
4459
  evidence: strings,
4459
- source: { ...object2, description: "\u5DF2\u6709\u53EF\u590D\u7528\u660E\u6587\u7684 {username,password} \u5F15\u7528\uFF1A\u7ED3\u6784\u5316\u914D\u7F6E {path,keys}\u3001\u6E90\u7801\u5E38\u91CF/\u5BF9\u8C61\u5C5E\u6027/\u9ED8\u8BA4\u503C/\u54C8\u5E0C\u51FD\u6570\u5B57\u7B26\u4E32\u5B57\u9762\u91CF\u53C2\u6570 {path,line,name} \u6216 SQLite \u660E\u6587\u5B57\u6BB5 {path,table,column,where}\u3002\u7F3A\u4EFB\u4F55\u4E00\u9879\u5219\u7701\u7565 source\u3002" },
4460
+ source: { ...object2, description: "\u4E3A\u5DF2\u6709\u53EF\u590D\u7528\u8D26\u5BC6\u63D0\u4F9B {username,password} \u5F15\u7528\uFF1A\u7ED3\u6784\u5316\u914D\u7F6E {path,keys}\u3001\u6E90\u7801 {path,line,name} \u6216 SQLite \u660E\u6587\u5B57\u6BB5 {path,table,column,where}\u3002\u6E90\u7801 name \u586B\u5B57\u6BB5\u540D\uFF08\u5982 username\u3001passwordHash\uFF09\uFF0Cline \u586B\u5B9A\u4E49\u8BE5\u5B57\u6BB5\u7684\u884C\u53F7\uFF0C\u7981\u6B62\u586B\u771F\u5B9E\u5BC6\u7801\u3002\u53EA\u6709\u6E90\u7801\u548C\u771F\u5B9E\u914D\u7F6E\u5747\u7F3A\u5C11\u53EF\u590D\u7528\u8D26\u5BC6\u65F6\u624D\u7701\u7565 source\u3002" },
4460
4461
  storage: { ...object2, description: "\u9996\u6B21\u5EFA\u53F7\u4EC5\u5728\u4EA4\u4ED8\u526F\u672C\u4E2D\u5199\u5165\u5E94\u7528\u771F\u6B63\u8BFB\u53D6\u7684 SQLite \u6216 JSON/YAML \u6587\u4EF6\uFF0C\u5177\u4F53\u7ED3\u6784\u89C1 references/contract.md\u3002" }
4461
4462
  } },
4462
4463
  auth_rules: { ...objects, description: '\u6BCF\u6761\u89C4\u5219\u987B\u4E8C\u9009\u4E00\u586B\u5199 path \u6216 prefix\uFF1Bevidence \u662F\u89C4\u5219\u9876\u5C42\u5FC5\u586B\u6570\u7EC4\uFF08\u4E0E auth \u5E73\u7EA7\uFF0C\u4E0D\u8981\u653E\u5728 auth \u5185\u90E8\uFF09\uFF1B\u540C\u6743\u9650\u9875\u9762\u53EF\u7528 target="page" \u4E14 prefix="/" \u7EDF\u4E00\u8986\u76D6', items: { ...object2, properties: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dsh-plugin-opc",
3
- "version": "0.1.32",
3
+ "version": "0.1.33",
4
4
  "description": "OPC Enterprise Plugin for DeepSeek Harness (DSH)",
5
5
  "type": "module",
6
6
  "publishConfig": {
@@ -76,14 +76,60 @@ def original_account_field(source, reference):
76
76
  return value
77
77
 
78
78
 
79
- def validate_account_plan(source, contract):
79
+ def initial_admin_source(source, evidence):
80
+ """Find one administrator seed object in the cited original code."""
81
+ locations = {}
82
+ for citation in evidence if isinstance(evidence, list) else []:
83
+ if not isinstance(citation, str):
84
+ continue
85
+ match = re.fullmatch(r"(.+):(\d+)(?:-(\d+))?", citation)
86
+ if match:
87
+ locations.setdefault(match[1], []).append((int(match[2]), int(match[3] or match[2])))
88
+ candidates = []
89
+ for name, spans in locations.items():
90
+ path = d.relative(source, name)
91
+ if path.suffix not in {".js", ".mjs", ".cjs", ".ts"} or not path.is_file():
92
+ continue
93
+ text = d.text_of(path) or ""
94
+ offset, line_number = 0, 1
95
+ for obj in re.finditer(r"\{[^{}]*\}", text):
96
+ lines = obj[0].splitlines()[1:-1]
97
+ line_number += text.count("\n", offset, obj.start())
98
+ offset = obj.start()
99
+ first = line_number + 1
100
+ if not any(start <= first + len(lines) - 1 and end >= first for start, end in spans):
101
+ continue
102
+ if not any(_extract_literal_rhs(line, "role") in ('"admin"', "'admin'") for line in lines):
103
+ continue
104
+ refs = {}
105
+ for kind, fields in (("username", ("username",)), ("password", ("password", "passwordHash"))):
106
+ matches = [
107
+ {"path": name, "line": number, "name": field}
108
+ for number, line in enumerate(lines, first)
109
+ for field in fields if _extract_literal_rhs(line, field)
110
+ ]
111
+ if len(matches) == 1:
112
+ refs[kind] = matches[0]
113
+ if len(refs) == 2 and all(original_account_field(source, ref) for ref in refs.values()):
114
+ candidates.append(refs)
115
+ return candidates[0] if len(candidates) == 1 else None
116
+
117
+
118
+ def validate_account_plan(source, contract, reuse_source_admin=False):
80
119
  plan = contract.get("admin_account")
81
120
  if plan is None:
82
121
  return
83
122
  d.require(isinstance(plan, dict) and set(plan) <= {"mode", "profile", "evidence", "source", "storage"}, "管理员方案只能声明位置与格式")
84
- profile = contract.get("auth_profiles", {}).get(plan.get("profile", ""))
85
- d.require(bool(profile and profile.get("login_url") and profile.get("username_env") and profile.get("password_env")
86
- and profile["username_env"] != profile["password_env"]), "管理员账密必须绑定已有登录方式")
123
+ profiles = contract.get("auth_profiles", {})
124
+ profile_id = plan.get("profile", "")
125
+ profile = profiles.get(profile_id) if isinstance(profiles, dict) and isinstance(profile_id, str) else None
126
+ login_fields = ("login_url", "username_env", "password_env")
127
+ if isinstance(profile, dict) and isinstance(profile.get(profile_id), dict) and not any(key in profile for key in login_fields):
128
+ nested = profile.pop(profile_id)
129
+ profiles[profile_id] = profile = {**profile, **nested}
130
+ d.require(bool(isinstance(profile, dict) and all(profile.get(key) for key in login_fields)
131
+ and profile["username_env"] != profile["password_env"]),
132
+ "管理员账密必须绑定已有登录方式。请在 auth_profiles 的对应对象内直接声明 login_url、username_env、password_env。")
87
133
  routes = [*contract.get("apis", []), *contract.get("pages", [])]
88
134
  d.require(any(item.get("auth", {}).get("profile") == plan["profile"] for item in routes), "请将管理员登录方式绑定到实际受保护的接口或页面")
89
135
  if plan.get("mode") == "existing":
@@ -91,7 +137,17 @@ def validate_account_plan(source, contract):
91
137
  if "source" in plan:
92
138
  references = plan["source"]
93
139
  d.require(isinstance(references, dict) and set(references) == {"username", "password"}, "请提供账号和密码的原始位置")
94
- d.require(all(original_account_field(source, ref) for ref in references.values()), "原配置没有完整的账密,请从改造会话询问")
140
+ try:
141
+ d.require(all(original_account_field(source, ref) for ref in references.values()), "原配置没有完整的账密")
142
+ return
143
+ except ValueError:
144
+ code_refs = all(isinstance(ref, dict) and "line" in ref for ref in references.values())
145
+ if reuse_source_admin and code_refs and (found := initial_admin_source(source, plan.get("evidence"))):
146
+ plan["source"] = found
147
+ return
148
+ raise
149
+ if reuse_source_admin and (found := initial_admin_source(source, plan.get("evidence"))):
150
+ plan["source"] = found
95
151
  return
96
152
  d.require(plan.get("mode") == "create" and "source" not in plan, "管理员方案必须选择 existing 或 create")
97
153
  target = plan.get("storage")
package/runtime/worker.py CHANGED
@@ -161,6 +161,7 @@ def resolve_and_enrich_proposal(
161
161
  revision_count: int = 1,
162
162
  feedback_text: str = "",
163
163
  expected_port: int | None = None,
164
+ reuse_source_admin: bool = False,
164
165
  ) -> tuple[dict, dict | None, dict | None]:
165
166
  d.require(isinstance(proposal, dict) and isinstance(proposal.get("summary"), str) and proposal["summary"].strip(), "提案缺少摘要")
166
167
  for field in ("issues", "changes", "unresolved"):
@@ -315,8 +316,8 @@ def resolve_and_enrich_proposal(
315
316
  lambda: validate_auth_questions(proposal),
316
317
  lambda: resolve_authentication(contract),
317
318
  lambda: validate_auth_evidence(source, proposal),
319
+ lambda: validate_account_plan(source, contract, reuse_source_admin),
318
320
  lambda: d.validate_credential_references(contract),
319
- lambda: validate_account_plan(source, contract),
320
321
  ]
321
322
  if not proposal.get("unresolved") and not contract.get("unresolved"):
322
323
  checks.append(lambda: validate_auth_probe_coverage(contract))
@@ -340,7 +341,7 @@ def resolve_and_enrich_proposal(
340
341
 
341
342
 
342
343
  def apply_plan(root, proposal, target, *, repair=False, failed_revision="", failure_feedback="", expected_port=None,
343
- revision_count=1, feedback_text="", admin_reply=None, previous_skill_markdown=""):
344
+ revision_count=1, feedback_text="", admin_reply=None, previous_skill_markdown="", reuse_source_admin=False):
344
345
  original = root / "review"
345
346
  d.require(d.inspect_source(original / "source")[0] == d.load(original / "inventory.json")["files"], "Source changed; import again")
346
347
  d.require(isinstance(proposal.get("summary"), str) and proposal["summary"].strip(), "summary required")
@@ -353,6 +354,7 @@ def apply_plan(root, proposal, target, *, repair=False, failed_revision="", fail
353
354
  expected_port=expected_port,
354
355
  revision_count=revision_count,
355
356
  feedback_text=feedback_text,
357
+ reuse_source_admin=reuse_source_admin,
356
358
  )
357
359
  d.require(not (proposal.get("unresolved") or proposal["contract"].get("unresolved")), "Resolve outstanding questions before preparation")
358
360
  shutil.copytree(original, target)
@@ -769,6 +771,7 @@ def main(body):
769
771
  revision_count=rev_count,
770
772
  feedback_text=fb_text,
771
773
  expected_port=body.get("expected_port"),
774
+ reuse_source_admin=body.get("reuse_source_admin") is True,
772
775
  )
773
776
  diffs = compute_change_diffs(source_dir, proposal.get("changes", []))
774
777
  _, has_orig = extract_original_config_values(source_dir, (proposal.get("contract") or {}).get("configs", []))
@@ -795,6 +798,7 @@ def main(body):
795
798
  feedback_text=fb_text,
796
799
  admin_reply=body.get("admin_reply"),
797
800
  previous_skill_markdown=body.get("previous_skill_markdown", ""),
801
+ reuse_source_admin=body.get("reuse_source_admin") is True,
798
802
  )
799
803
  d.bundle_work(temp_path / "approved", temp_path / "bundle", login)
800
804
  syntax_check = check_archive_syntax(temp_path / "bundle/app.tar")