dsh-plugin-opc 0.1.32 → 0.1.34

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) => {
@@ -59878,6 +59876,12 @@ function Panel({ api, sessionId, requestedPage, navigationRevision, visible = tr
59878
59876
  const [services, setServices] = (0, import_react11.useState)([]);
59879
59877
  const [appsRefreshTrigger, setAppsRefreshTrigger] = (0, import_react11.useState)(0);
59880
59878
  const [showSettings, setShowSettings] = (0, import_react11.useState)(false);
59879
+ const [knowledgeFilter, setKnowledgeFilter] = (0, import_react11.useState)("all");
59880
+ const [includesSharedKnowledge, setIncludesSharedKnowledge] = (0, import_react11.useState)(null);
59881
+ const knowledgeItems = items.filter((item) => {
59882
+ const shared = item.source_tenant_id && item.source_tenant_id !== item.tenant_id;
59883
+ return knowledgeFilter === "all" || (knowledgeFilter === "shared" ? shared : !shared);
59884
+ });
59881
59885
  const [kbSearchMode, setKbSearchMode] = (0, import_react11.useState)("doc");
59882
59886
  const [docQuery, setDocQuery] = (0, import_react11.useState)("");
59883
59887
  const [hasSearchedDoc, setHasSearchedDoc] = (0, import_react11.useState)(false);
@@ -59931,14 +59935,22 @@ function Panel({ api, sessionId, requestedPage, navigationRevision, visible = tr
59931
59935
  if (kind === "mcp") {
59932
59936
  const body = JSON.parse(await api.listMcpServices());
59933
59937
  if (version2 === epoch.current) setServices(body.data?.services ?? body.services ?? []);
59934
- } else {
59935
- const rows = JSON.parse(await (kind === "skills" ? api.listSkillsCatalog(query) : api.listKnowledgeBases(query)));
59938
+ } else if (kind === "skills") {
59939
+ const rows = JSON.parse(await api.listSkillsCatalog(query));
59936
59940
  if (version2 === epoch.current) setItems(rows);
59941
+ } else {
59942
+ const directory = JSON.parse(await api.listKnowledgeBases(query));
59943
+ if (version2 === epoch.current) {
59944
+ setItems(Array.isArray(directory) ? directory : directory.items);
59945
+ setIncludesSharedKnowledge(directory.includesShared === true);
59946
+ }
59937
59947
  }
59938
59948
  }, [api, kind, q]);
59939
59949
  (0, import_react11.useEffect)(() => {
59940
59950
  epoch.current++;
59941
59951
  setItems([]);
59952
+ setKnowledgeFilter("all");
59953
+ setIncludesSharedKnowledge(null);
59942
59954
  setHits([]);
59943
59955
  setDoc("");
59944
59956
  setServices([]);
@@ -60084,7 +60096,7 @@ function Panel({ api, sessionId, requestedPage, navigationRevision, visible = tr
60084
60096
  value: kb,
60085
60097
  onChange: (e) => setKb(e.target.value)
60086
60098
  },
60087
- /* @__PURE__ */ import_react11.default.createElement("option", { value: "" }, "\u5F53\u524D\u7A7A\u95F4\u5168\u90E8\u77E5\u8BC6\u5E93"),
60099
+ /* @__PURE__ */ import_react11.default.createElement("option", { value: "" }, "\u5F53\u524D\u7A7A\u95F4\u5168\u90E8\u53EF\u7528\u77E5\u8BC6\u5E93"),
60088
60100
  items.map((item) => /* @__PURE__ */ import_react11.default.createElement("option", { key: item.knowledge_base_id, value: item.knowledge_base_id }, item.name))
60089
60101
  ),
60090
60102
  /* @__PURE__ */ import_react11.default.createElement(
@@ -60146,7 +60158,7 @@ function Panel({ api, sessionId, requestedPage, navigationRevision, visible = tr
60146
60158
  },
60147
60159
  "\u6E05\u9664"
60148
60160
  )
60149
- ), hasSearchedDoc && hits.length === 0 && !busy && /* @__PURE__ */ import_react11.default.createElement("div", { className: "notice", style: { background: "#f8fafc", borderColor: "#94a3b8", color: "#64748b", fontSize: 12, margin: "8px 0" } }, "\u672A\u627E\u5230\u4E0E\u201C", docQuery, "\u201D\u76F8\u5173\u7684\u6587\u6863\u7247\u6BB5\u3002\u53EF\u5C1D\u8BD5\u66F4\u6362\u68C0\u7D22\u8BCD\uFF0C\u6216\u5728\u4E0A\u65B9\u9009\u62E9\u300C\u5F53\u524D\u7A7A\u95F4\u5168\u90E8\u77E5\u8BC6\u5E93\u300D\u3002"), hits.length > 0 && /* @__PURE__ */ import_react11.default.createElement("div", { className: "kb-results-card" }, /* @__PURE__ */ import_react11.default.createElement("div", { className: "kb-results-header" }, /* @__PURE__ */ import_react11.default.createElement("div", { className: "kb-results-title" }, /* @__PURE__ */ import_react11.default.createElement("span", null, "\u{1F4C4} \u6587\u6863\u68C0\u7D22\u7ED3\u679C"), /* @__PURE__ */ import_react11.default.createElement("span", { className: "badge badge-ok" }, hits.length, " \u6761\u76F8\u5173\u7247\u6BB5")), /* @__PURE__ */ import_react11.default.createElement(
60161
+ ), hasSearchedDoc && hits.length === 0 && !busy && /* @__PURE__ */ import_react11.default.createElement("div", { className: "notice", style: { background: "#f8fafc", borderColor: "#94a3b8", color: "#64748b", fontSize: 12, margin: "8px 0" } }, "\u672A\u627E\u5230\u4E0E\u201C", docQuery, "\u201D\u76F8\u5173\u7684\u6587\u6863\u7247\u6BB5\u3002\u53EF\u5C1D\u8BD5\u66F4\u6362\u68C0\u7D22\u8BCD\uFF0C\u6216\u5728\u4E0A\u65B9\u9009\u62E9\u300C\u5F53\u524D\u7A7A\u95F4\u5168\u90E8\u53EF\u7528\u77E5\u8BC6\u5E93\u300D\u3002"), hits.length > 0 && /* @__PURE__ */ import_react11.default.createElement("div", { className: "kb-results-card" }, /* @__PURE__ */ import_react11.default.createElement("div", { className: "kb-results-header" }, /* @__PURE__ */ import_react11.default.createElement("div", { className: "kb-results-title" }, /* @__PURE__ */ import_react11.default.createElement("span", null, "\u{1F4C4} \u6587\u6863\u68C0\u7D22\u7ED3\u679C"), /* @__PURE__ */ import_react11.default.createElement("span", { className: "badge badge-ok" }, hits.length, " \u6761\u76F8\u5173\u7247\u6BB5")), /* @__PURE__ */ import_react11.default.createElement(
60150
60162
  "button",
60151
60163
  {
60152
60164
  type: "button",
@@ -60172,10 +60184,10 @@ function Panel({ api, sessionId, requestedPage, navigationRevision, visible = tr
60172
60184
  String(hit.title ?? hit.knowledge_id)
60173
60185
  ), typeof hit.score === "number" && /* @__PURE__ */ import_react11.default.createElement("span", { className: "badge" }, "\u76F8\u5173\u5EA6: ", hit.score.toFixed(2))), /* @__PURE__ */ import_react11.default.createElement("p", { style: { margin: "6px 0 0", fontSize: 12, color: "#64748b", lineHeight: 1.5 } }, String(hit.snippet ?? hit.content ?? ""))))), doc && /* @__PURE__ */ import_react11.default.createElement("div", { className: "doc-box", style: { marginTop: 0, marginBottom: 14 } }, /* @__PURE__ */ import_react11.default.createElement("div", { style: { display: "flex", justifyContent: "space-between", alignItems: "center", marginBottom: 10 } }, /* @__PURE__ */ import_react11.default.createElement("strong", null, "\u{1F4C4} \u6587\u6863\u8BE6\u60C5\u6B63\u6587"), /* @__PURE__ */ import_react11.default.createElement("button", { onClick: () => setDoc("") }, "\u5173\u95ED\u6B63\u6587")), /* @__PURE__ */ import_react11.default.createElement(Markdown, null, doc)), pin && /* @__PURE__ */ import_react11.default.createElement("div", { className: "notice" }, /* @__PURE__ */ import_react11.default.createElement("strong", null, "\u5F53\u524D\u5BF9\u8BDD\u95EE\u7B54\u5DF2\u9650\u5B9A\u8303\u56F4\uFF1A"), items.find((item) => item.knowledge_base_id === pin)?.name ?? pin, /* @__PURE__ */ import_react11.default.createElement("button", { style: { marginLeft: 8 }, onClick: action(async () => {
60174
60186
  await api.setPinnedKnowledgeScope(sessionId, null, context.contextId);
60175
- }) }, "\u53D6\u6D88\u9650\u5B9A")), /* @__PURE__ */ import_react11.default.createElement("div", { className: "kb-section-header" }, /* @__PURE__ */ import_react11.default.createElement("div", { className: "kb-section-title" }, /* @__PURE__ */ import_react11.default.createElement("span", null, "\u{1F4DA} \u77E5\u8BC6\u5E93\u5217\u8868"), /* @__PURE__ */ import_react11.default.createElement("span", { className: "badge" }, items.length)), q ? /* @__PURE__ */ import_react11.default.createElement("div", { style: { display: "flex", alignItems: "center", gap: 6 } }, /* @__PURE__ */ import_react11.default.createElement("span", { className: "badge badge-warn" }, "\u5DF2\u6309\u201C", q, "\u201D\u8FC7\u6EE4"), /* @__PURE__ */ import_react11.default.createElement("button", { className: "btn-sm", onClick: () => {
60187
+ }) }, "\u53D6\u6D88\u9650\u5B9A")), /* @__PURE__ */ import_react11.default.createElement("div", { className: "kb-section-header" }, /* @__PURE__ */ import_react11.default.createElement("div", { className: "kb-section-title" }, /* @__PURE__ */ import_react11.default.createElement("span", null, "\u{1F4DA} \u77E5\u8BC6\u5E93\u5217\u8868"), /* @__PURE__ */ import_react11.default.createElement("span", { className: "badge" }, knowledgeItems.length), includesSharedKnowledge && /* @__PURE__ */ import_react11.default.createElement("select", { "aria-label": "\u77E5\u8BC6\u5E93\u6765\u6E90", value: knowledgeFilter, onChange: (e) => setKnowledgeFilter(e.target.value) }, /* @__PURE__ */ import_react11.default.createElement("option", { value: "all" }, "\u5168\u90E8\u53EF\u7528"), /* @__PURE__ */ import_react11.default.createElement("option", { value: "owned" }, "\u672C\u7A7A\u95F4"), /* @__PURE__ */ import_react11.default.createElement("option", { value: "shared" }, "\u5171\u4EAB\u7ED9\u6211"))), q ? /* @__PURE__ */ import_react11.default.createElement("div", { style: { display: "flex", alignItems: "center", gap: 6 } }, /* @__PURE__ */ import_react11.default.createElement("span", { className: "badge badge-warn" }, "\u5DF2\u6309\u201C", q, "\u201D\u8FC7\u6EE4"), /* @__PURE__ */ import_react11.default.createElement("button", { className: "btn-sm", onClick: () => {
60176
60188
  setQ("");
60177
60189
  void run(() => load(""));
60178
- } }, "\u6E05\u9664\u8FC7\u6EE4")) : /* @__PURE__ */ import_react11.default.createElement("span", { style: { fontSize: 11, color: "#94a3b8" } }, "\u70B9\u51FB\u5361\u7247\u300C\u68C0\u7D22\u6B64\u5E93\u300D\u53EF\u76F4\u63A5\u5B9A\u4F4D\u641C\u7D22")), /* @__PURE__ */ import_react11.default.createElement("div", { className: "cards-grid" }, items.map((item) => /* @__PURE__ */ import_react11.default.createElement("div", { key: item.knowledge_base_id, className: "resource-card" }, /* @__PURE__ */ import_react11.default.createElement("div", null, /* @__PURE__ */ import_react11.default.createElement("div", { className: "card-header" }, /* @__PURE__ */ import_react11.default.createElement("div", { style: { display: "flex", alignItems: "center", gap: 8, minWidth: 0 } }, /* @__PURE__ */ import_react11.default.createElement("div", { className: "card-icon", style: { background: "#f8fafc", color: "#334155" } }, "\u{1F4D6}"), /* @__PURE__ */ import_react11.default.createElement("h3", { className: "card-title" }, item.name)), /* @__PURE__ */ import_react11.default.createElement("span", { className: `badge ${item.availability === "available" ? "badge-ok" : ""}` }, item.availability === "available" ? "\u5DF2\u5C31\u7EEA" : "\u672A\u5C31\u7EEA")), /* @__PURE__ */ import_react11.default.createElement("p", { className: "card-desc" }, item.description || "\u6682\u65E0\u77E5\u8BC6\u5E93\u63CF\u8FF0")), /* @__PURE__ */ import_react11.default.createElement("div", { className: "card-actions" }, /* @__PURE__ */ import_react11.default.createElement(
60190
+ } }, "\u6E05\u9664\u8FC7\u6EE4")) : /* @__PURE__ */ import_react11.default.createElement("span", { style: { fontSize: 11, color: "#94a3b8" } }, "\u70B9\u51FB\u5361\u7247\u300C\u68C0\u7D22\u6B64\u5E93\u300D\u53EF\u76F4\u63A5\u5B9A\u4F4D\u641C\u7D22")), includesSharedKnowledge === false && /* @__PURE__ */ import_react11.default.createElement("div", { className: "notice" }, "\u5F53\u524D\u5E73\u53F0\u7248\u672C\u4EC5\u63D0\u4F9B\u672C\u7A7A\u95F4\u77E5\u8BC6\u5E93\u76EE\u5F55\u3002"), items.length > 0 && knowledgeItems.length === 0 && /* @__PURE__ */ import_react11.default.createElement("div", { className: "notice" }, "\u6B64\u6765\u6E90\u4E0B\u6CA1\u6709\u53EF\u7528\u77E5\u8BC6\u5E93\u3002"), /* @__PURE__ */ import_react11.default.createElement("div", { className: "cards-grid" }, knowledgeItems.map((item) => /* @__PURE__ */ import_react11.default.createElement("div", { key: item.knowledge_base_id, className: "resource-card" }, /* @__PURE__ */ import_react11.default.createElement("div", null, /* @__PURE__ */ import_react11.default.createElement("div", { className: "card-header" }, /* @__PURE__ */ import_react11.default.createElement("div", { style: { display: "flex", alignItems: "center", gap: 8, minWidth: 0 } }, /* @__PURE__ */ import_react11.default.createElement("div", { className: "card-icon", style: { background: "#f8fafc", color: "#334155" } }, "\u{1F4D6}"), /* @__PURE__ */ import_react11.default.createElement("h3", { className: "card-title" }, item.name)), /* @__PURE__ */ import_react11.default.createElement("span", { className: `badge ${item.availability === "available" ? "badge-ok" : ""}` }, item.availability === "available" ? "\u5DF2\u5C31\u7EEA" : "\u672A\u5C31\u7EEA")), item.source_tenant_id && item.source_tenant_id !== item.tenant_id && /* @__PURE__ */ import_react11.default.createElement("span", { className: "badge" }, "\u5171\u4EAB\u81EA ", item.source_tenant_name ?? item.source_tenant_id, item.permission === "viewer" ? " \xB7 \u53EA\u8BFB" : ""), /* @__PURE__ */ import_react11.default.createElement("p", { className: "card-desc" }, item.description || "\u6682\u65E0\u77E5\u8BC6\u5E93\u63CF\u8FF0")), /* @__PURE__ */ import_react11.default.createElement("div", { className: "card-actions" }, /* @__PURE__ */ import_react11.default.createElement(
60179
60191
  "button",
60180
60192
  {
60181
60193
  className: "primary",
package/lib/index.js CHANGED
@@ -510,6 +510,9 @@ function resourceItem(value) {
510
510
  tenant_id: item.tenant_id,
511
511
  name: item.name,
512
512
  availability: item.availability,
513
+ source_tenant_id: typeof item.source_tenant_id === "string" ? item.source_tenant_id : void 0,
514
+ source_tenant_name: typeof item.source_tenant_name === "string" ? item.source_tenant_name : void 0,
515
+ permission: typeof item.permission === "string" ? item.permission : void 0,
513
516
  catalog_id: typeof item.catalog_id === "string" ? item.catalog_id : void 0,
514
517
  knowledge_base_id: typeof item.knowledge_base_id === "string" ? item.knowledge_base_id : void 0,
515
518
  version: typeof item.version === "string" ? item.version : void 0,
@@ -557,7 +560,7 @@ var ResourceAuthorization = class {
557
560
  captured.assertCurrent();
558
561
  const key = JSON.stringify(["knowledge", tenant, id]);
559
562
  const cached = this.#entries.get(key);
560
- if (cached && cached.expires > Date.now()) return;
563
+ if (cached && cached.expires > Date.now()) return cached.item;
561
564
  const items = await list();
562
565
  captured.assertCurrent();
563
566
  const item = items.find((item2) => item2.tenant_id === tenant && item2.knowledge_base_id === id && item2.availability === "available");
@@ -566,6 +569,7 @@ var ResourceAuthorization = class {
566
569
  throw new OpcError("RESOURCE_NOT_ACCESSIBLE");
567
570
  }
568
571
  this.#entries.set(key, { item, expires: Date.now() + 3e4 });
572
+ return item;
569
573
  }
570
574
  async catalog(tenant, catalog) {
571
575
  this.sync();
@@ -974,14 +978,22 @@ var OpcCore = class extends EventEmitter2 {
974
978
  return response.body;
975
979
  }
976
980
  async catalog(kind, q = "") {
981
+ return (await this.resourceDirectory(kind, q)).items;
982
+ }
983
+ async knowledgeDirectory(q = "") {
984
+ return this.resourceDirectory("knowledge-bases", q);
985
+ }
986
+ async resourceDirectory(kind, q) {
977
987
  const captured = this.auth.contexts.capture();
978
988
  const items = [];
979
- let offset = 0, complete = true;
989
+ const sharedQuery = kind === "knowledge-bases" ? "&include_shared=true" : "";
990
+ let offset = 0, complete = true, includesShared = kind === "knowledge-bases";
980
991
  for (; ; ) {
981
- const page = await this.request(`/integration/v1/resources/${kind}?tenant_id=${encodeURIComponent(captured.context.tenant)}&q=${encodeURIComponent(q)}&offset=${offset}&limit=100`);
992
+ const page = await this.request(`/integration/v1/resources/${kind}?tenant_id=${encodeURIComponent(captured.context.tenant)}&q=${encodeURIComponent(q)}&offset=${offset}&limit=100${sharedQuery}`);
982
993
  captured.assertCurrent();
983
994
  if (!Array.isArray(page.items) || typeof page.total !== "number") throw new OpcError("INVALID_PLATFORM_RESPONSE");
984
995
  complete &&= page.complete === true && (!Array.isArray(page.failures) || page.failures.length === 0);
996
+ includesShared &&= page.includes_shared === true;
985
997
  const current = page.items.map(resourceItem);
986
998
  if (current.some((item) => item.tenant_id !== captured.context.tenant)) throw new OpcError("SCOPE_MISMATCH");
987
999
  items.push(...current);
@@ -994,7 +1006,8 @@ var OpcCore = class extends EventEmitter2 {
994
1006
  }
995
1007
  this.emit("skills-changed");
996
1008
  }
997
- return items;
1009
+ if (kind === "knowledge-bases" && !complete) throw new OpcError("RESOURCE_DIRECTORY_INCOMPLETE", "\u77E5\u8BC6\u5E93\u76EE\u5F55\u52A0\u8F7D\u4E0D\u5B8C\u6574\uFF0C\u8BF7\u5237\u65B0\u91CD\u8BD5\u3002");
1010
+ return { items, includesShared };
998
1011
  }
999
1012
  }
1000
1013
  }
@@ -1014,16 +1027,14 @@ var OpcCore = class extends EventEmitter2 {
1014
1027
  const captured = this.auth.contexts.capture();
1015
1028
  const scope = this.scopes.searchParams(session, turn, space, knowledgeBaseId);
1016
1029
  if (scope.tenant_id !== captured.context.tenant) throw new OpcError("SPACE_FORBIDDEN");
1017
- if (scope.knowledge_base_id) {
1018
- await this.authz.knowledge(captured.context.tenant, scope.knowledge_base_id, () => this.catalog("knowledge-bases"));
1019
- }
1030
+ const scopedItem = scope.knowledge_base_id ? await this.authz.knowledge(captured.context.tenant, scope.knowledge_base_id, () => this.catalog("knowledge-bases")) : void 0;
1020
1031
  captured.assertCurrent();
1021
- const result = await this.request("/integration/v1/knowledge/search", { query, ...scope });
1032
+ const result = await this.request("/integration/v1/knowledge/search", { query, ...scope, include_shared: true });
1022
1033
  captured.assertCurrent();
1023
1034
  if (!Array.isArray(result.results)) throw new OpcError("INVALID_PLATFORM_RESPONSE");
1024
1035
  const ids = result.results.map((hit) => {
1025
1036
  if (!hit || typeof hit !== "object" || typeof hit.knowledge_id !== "string") throw new OpcError("INVALID_PLATFORM_RESPONSE");
1026
- if (scope.knowledge_base_id && ((hit.source_tenant ?? hit.tenant_id) !== scope.tenant_id || hit.knowledge_base_id !== scope.knowledge_base_id)) throw new OpcError("SCOPE_MISMATCH");
1037
+ if ((hit.tenant_id ?? hit.source_tenant) !== scope.tenant_id || scopedItem && (hit.knowledge_base_id !== scopedItem.knowledge_base_id || (hit.source_tenant ?? hit.tenant_id) !== (scopedItem.source_tenant_id ?? scopedItem.tenant_id))) throw new OpcError("SCOPE_MISMATCH");
1027
1038
  return hit.knowledge_id;
1028
1039
  });
1029
1040
  this.scopes.recordHits(session, turn, ids);
@@ -1035,14 +1046,16 @@ var OpcCore = class extends EventEmitter2 {
1035
1046
  const scope = this.scopes.scope(session, turn);
1036
1047
  await this.authz.session();
1037
1048
  captured.assertCurrent();
1038
- if (scope) await this.authz.knowledge(captured.context.tenant, scope.knowledgeBaseId, () => this.catalog("knowledge-bases"));
1049
+ const scopedItem = scope ? await this.authz.knowledge(captured.context.tenant, scope.knowledgeBaseId, () => this.catalog("knowledge-bases")) : void 0;
1039
1050
  captured.assertCurrent();
1040
- const result = await this.request(`/integration/v1/knowledge/${encodeURIComponent(knowledgeId)}?include_content=true&tenant=${encodeURIComponent(captured.context.tenant)}${scope ? `&knowledge_base_id=${encodeURIComponent(scope.knowledgeBaseId)}` : ""}`);
1051
+ const result = await this.request(`/integration/v1/knowledge/${encodeURIComponent(knowledgeId)}?include_content=true&include_shared=true&tenant=${encodeURIComponent(captured.context.tenant)}${scope ? `&knowledge_base_id=${encodeURIComponent(scope.knowledgeBaseId)}` : ""}`);
1041
1052
  captured.assertCurrent();
1042
1053
  const data = result.data;
1043
- this.scopes.verifyDocument(session, turn, String(result.source_tenant ?? ""), data?.knowledge_base_id ?? "");
1044
- if (result.source_tenant !== captured.context.tenant || !data?.knowledge_base_id) throw new OpcError("SCOPE_MISMATCH");
1045
- await this.authz.knowledge(captured.context.tenant, data.knowledge_base_id, () => this.catalog("knowledge-bases"));
1054
+ const tenant = result.tenant_id ?? result.source_tenant;
1055
+ if (tenant !== captured.context.tenant || !data?.knowledge_base_id) throw new OpcError("SCOPE_MISMATCH");
1056
+ this.scopes.verifyDocument(session, turn, tenant, data.knowledge_base_id);
1057
+ const item = scopedItem ?? await this.authz.knowledge(tenant, data.knowledge_base_id, () => this.catalog("knowledge-bases"));
1058
+ if (result.source_tenant !== (item.source_tenant_id ?? item.tenant_id)) throw new OpcError("SCOPE_MISMATCH");
1046
1059
  captured.assertCurrent();
1047
1060
  if (typeof data?.content !== "string") throw new OpcError("KNOWLEDGE_CONTENT_UNAVAILABLE", "\u5E73\u53F0\u672A\u8FD4\u56DE\u6587\u6863\u6B63\u6587\uFF0C\u9700\u8981\u542F\u7528\u6B63\u6587\u8BFB\u53D6\u63A5\u53E3\u3002");
1048
1061
  return result;
@@ -1791,7 +1804,7 @@ var OpcRemoteService = class extends (_a = TypertRemoteService, _appList_dec = [
1791
1804
  this.core.auth.switchTenant(tenantId);
1792
1805
  }
1793
1806
  async listKnowledgeBases(q) {
1794
- return JSON.stringify(await this.core.catalog("knowledge-bases", q));
1807
+ return JSON.stringify(await this.core.knowledgeDirectory(q));
1795
1808
  }
1796
1809
  async listSkillsCatalog(q) {
1797
1810
  const captured = this.core.auth.contexts.capture();
@@ -3474,6 +3487,7 @@ ${trimmedFeedback}` : trimmedFeedback || prevFailure).slice(-24e3);
3474
3487
  root,
3475
3488
  proposal,
3476
3489
  allow_unresolved: hasQuestions || adminAccountPending,
3490
+ reuse_source_admin: !job.upgrade && !job.published && !adminReply && !canReusePrevious,
3477
3491
  admin_reply: adminReply,
3478
3492
  previous_skill_markdown: canReusePrevious ? job.skillMarkdown : void 0,
3479
3493
  repair: Boolean(job.failedRevision),
@@ -3490,7 +3504,7 @@ ${trimmedFeedback}` : trimmedFeedback || prevFailure).slice(-24e3);
3490
3504
  if (job.portAuto && Number.isInteger(validatedPort) && validatedPort >= 1 && validatedPort <= 65535) {
3491
3505
  job.port = validatedPort;
3492
3506
  }
3493
- if (adminAccountPending) job.proposal.adminAccountPending = true;
3507
+ if (adminAccountPending && !job.proposal.contract.admin_account?.source) job.proposal.adminAccountPending = true;
3494
3508
  else delete job.proposal.adminAccountPending;
3495
3509
  job.discoveryReport = validated?.discovery_report ?? job.discoveryReport;
3496
3510
  job.transformationReport = validated?.transformation_report ?? job.transformationReport;
@@ -4451,12 +4465,12 @@ function proposalParameters(port, portLocked = true) {
4451
4465
  login_method: str,
4452
4466
  token_json_path: str
4453
4467
  } },
4454
- auth_profiles: { ...object2, description: "\u6309 ID \u4FDD\u5B58\u767B\u5F55\u65B9\u5F0F\uFF0C\u63A5\u53E3\u901A\u8FC7 auth.profile \u5F15\u7528" },
4468
+ 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
4469
  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
4470
  mode: { ...text2, enum: ["existing", "create"] },
4457
4471
  profile: text2,
4458
4472
  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" },
4473
+ 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
4474
  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
4475
  } },
4462
4476
  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.34",
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")