@staff0rd/assist 0.780.1 → 0.781.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.780.1",
+  version: "0.781.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -518,33 +518,6 @@ function originDisplayName(origin) {
   return origin.slice(firstSlash + 1);
 }
 
-// src/commands/backlog/originDisplayLabels.ts
-function originDisplayLabels(origins) {
-  const isLocal = (origin) => origin.startsWith("local:");
-  const bareName = (origin) => {
-    const full = originDisplayName(origin);
-    const segments = full.split("/");
-    return segments[segments.length - 1] ?? full;
-  };
-  const remoteCounts = /* @__PURE__ */ new Map();
-  for (const origin of new Set(origins)) {
-    if (isLocal(origin)) continue;
-    const name = bareName(origin);
-    remoteCounts.set(name, (remoteCounts.get(name) ?? 0) + 1);
-  }
-  const labels = /* @__PURE__ */ new Map();
-  for (const origin of origins) {
-    if (isLocal(origin)) {
-      labels.set(origin, originDisplayName(origin));
-      continue;
-    }
-    const name = bareName(origin);
-    const collides = (remoteCounts.get(name) ?? 0) > 1;
-    labels.set(origin, collides ? originDisplayName(origin) : name);
-  }
-  return labels;
-}
-
 // src/shared/resolveRepoOverride.ts
 var AmbiguousRepoConfigError = class extends Error {
   name = "AmbiguousRepoConfigError";
@@ -578,17 +551,6 @@ function resolveRepoOverride(globalRaw, origin, source) {
     return {};
   return override;
 }
-function resolveRepoWriteLabel(globalRaw, origin) {
-  const repos2 = globalRaw.repos;
-  if (repos2 && typeof repos2 === "object" && !Array.isArray(repos2)) {
-    const candidates = originKeyCandidates(origin);
-    const existing = Object.keys(repos2).find(
-      (key) => candidates.has(key)
-    );
-    if (existing) return existing;
-  }
-  return originDisplayLabels([origin]).get(origin) ?? origin;
-}
 
 // src/shared/resolveRepoLayer.ts
 var SHARED_REPO_CONFIG_SOURCE = "the shared db";
@@ -6671,6 +6633,33 @@ async function addPhase(id, name, options2) {
 // src/commands/backlog/list.ts
 import chalk51 from "chalk";
 
+// src/commands/backlog/originDisplayLabels.ts
+function originDisplayLabels(origins) {
+  const isLocal = (origin) => origin.startsWith("local:");
+  const bareName = (origin) => {
+    const full = originDisplayName(origin);
+    const segments = full.split("/");
+    return segments[segments.length - 1] ?? full;
+  };
+  const remoteCounts = /* @__PURE__ */ new Map();
+  for (const origin of new Set(origins)) {
+    if (isLocal(origin)) continue;
+    const name = bareName(origin);
+    remoteCounts.set(name, (remoteCounts.get(name) ?? 0) + 1);
+  }
+  const labels = /* @__PURE__ */ new Map();
+  for (const origin of origins) {
+    if (isLocal(origin)) {
+      labels.set(origin, originDisplayName(origin));
+      continue;
+    }
+    const name = bareName(origin);
+    const collides = (remoteCounts.get(name) ?? 0) > 1;
+    labels.set(origin, collides ? originDisplayName(origin) : name);
+  }
+  return labels;
+}
+
 // src/commands/backlog/list/shared.ts
 import chalk50 from "chalk";
 function statusIcon(status2) {
@@ -27374,48 +27363,18 @@ function normaliseItems(items2) {
   return items2.map(toItem);
 }
 
-// src/commands/config/resolveRepoConfigBlock.ts
-function resolveRepoConfigBlock(repoName, cwd, globalConfigPath) {
-  const globalRaw = loadGlobalConfigRaw(globalConfigPath);
-  const label2 = repoName === void 0 ? resolveRepoWriteLabel(globalRaw, getCurrentOrigin(cwd)) : resolveNamedRepoWriteLabel(globalRaw, repoName);
-  const repos2 = isPlainObject7(globalRaw.repos) ? { ...globalRaw.repos } : {};
-  const block = isPlainObject7(repos2[label2]) ? repos2[label2] : {};
-  return { globalRaw, repos: repos2, label: label2, block };
-}
-function isPlainObject7(value) {
-  return value !== null && typeof value === "object" && !Array.isArray(value);
-}
-
-// src/commands/config/applyRepoConfigSet.ts
-function applyRepoConfigSet(key, coerced, repoName, cwd = process.cwd(), globalConfigPath) {
-  const globalOnly = globalOnlyRepoKeyError(key, "Set");
-  if (globalOnly) return globalOnly;
-  const { globalRaw, repos: repos2, label: label2, block } = resolveRepoConfigBlock(
-    repoName,
-    cwd,
-    globalConfigPath
-  );
-  const updatedBlock = setNestedValue(block, key, coerced);
-  const validation = validateConfig(updatedBlock, key, repoConfigSchema);
-  if (!validation.ok) return validation;
-  repos2[label2] = updatedBlock;
-  saveGlobalConfig({ ...globalRaw, repos: repos2 }, globalConfigPath);
-  return { ok: true, target: "repo", label: label2 };
-}
-
 // src/commands/miro/saveMiroExtract.ts
-function saveToRepo(key, extract2, repo, { cwd, globalConfigPath }) {
-  const result = applyRepoConfigSet(
+async function saveToRepo(key, extract2, repo, cwd) {
+  const result = await applySharedRepoConfigSet(
     key,
     extract2,
     typeof repo === "string" ? repo : void 0,
-    cwd,
-    globalConfigPath
+    cwd
   );
   if (!result.ok) throw new MiroExtractError(result.errors.join("\n"));
-  return `${globalConfigFileLabel(globalConfigPath)} under repos.${result.label}`;
+  return `${SHARED_REPO_CONFIG_SOURCE} under repos.${result.label}`;
 }
-function saveMiroExtract(name, extract2, options2, paths = {}) {
+async function saveMiroExtract(name, extract2, options2, paths = {}) {
   const resolved = {
     cwd: paths.cwd ?? process.cwd(),
     globalConfigPath: paths.globalConfigPath ?? getGlobalConfigPath()
@@ -27426,7 +27385,7 @@ function saveMiroExtract(name, extract2, options2, paths = {}) {
     );
   const key = `miro.extracts.${name}`;
   if (options2.repo !== void 0)
-    return saveToRepo(key, extract2, options2.repo, resolved);
+    return saveToRepo(key, extract2, options2.repo, resolved.cwd);
   const result = applyConfigSet(
     key,
     extract2,
@@ -27450,9 +27409,8 @@ async function extractName(options2) {
 async function offerSaveExtract(extract2, options2, paths = {}) {
   const name = await extractName(options2);
   if (!name) return;
-  console.log(
-    `Saved extract "${name}" to ${saveMiroExtract(name, extract2, options2, paths)}`
-  );
+  const target = await saveMiroExtract(name, extract2, options2, paths);
+  console.log(`Saved extract "${name}" to ${target}`);
 }
 
 // src/commands/miro/pickAnchors.ts
@@ -27700,7 +27658,7 @@ function registerMiro(program2) {
     "Save the selection as this named extract without asking"
   ).option("-g, --global", "Save the extract to global ~/.assist.yml").option(
     "-r, --repo [name]",
-    "Requires -g: scope the saved extract to a repo's identity (defaults to the current repo)"
+    "Requires -g: save the extract to a repo's shared db override instead (defaults to the current repo)"
   ).action(
     (name, options2) => runExtract(name, options2)
   );
@@ -31081,7 +31039,7 @@ function applyConfigWrites(base, writes, schema2) {
 }
 
 // src/commands/config/writeConfigKeys.ts
-function writeConfigKeys(writes, scope, cwd = process.cwd(), globalConfigPath) {
+async function writeConfigKeys(writes, scope, cwd = process.cwd()) {
   const globalOnly = writes.filter((write) => isGlobalOnlyConfigKey(write.key));
   if (globalOnly.length > 0) {
     return {
@@ -31091,23 +31049,19 @@ function writeConfigKeys(writes, scope, cwd = process.cwd(), globalConfigPath) {
       )
     };
   }
-  if (scope === "repo") return writeRepoBlock(writes, cwd, globalConfigPath);
+  if (scope === "repo") return writeRepoBlock(writes, cwd);
   const applied = applyConfigWrites(loadProjectConfig(cwd), writes);
   if (!applied.ok) return applied;
   saveConfig(applied.updated, cwd);
   return { ok: true, target: "project assist.yml" };
 }
-function writeRepoBlock(writes, cwd, globalConfigPath) {
-  const { globalRaw, repos: repos2, label: label2, block } = resolveRepoConfigBlock(
-    void 0,
-    cwd,
-    globalConfigPath
-  );
+async function writeRepoBlock(writes, cwd) {
+  const orm = await getDb();
+  const { label: label2, block } = await resolveSharedRepoBlock(orm, void 0, cwd);
   const applied = applyConfigWrites(block, writes, repoConfigSchema);
   if (!applied.ok) return applied;
-  repos2[label2] = applied.updated;
-  saveGlobalConfig({ ...globalRaw, repos: repos2 }, globalConfigPath);
-  return { ok: true, target: `~/.assist.yml, repo: ${label2}` };
+  await saveSharedRepoBlock(orm, label2, applied.updated);
+  return { ok: true, target: `${SHARED_REPO_CONFIG_SOURCE}, repo: ${label2}` };
 }
 
 // src/commands/releases/declaredStreamsInScope.ts
@@ -31117,10 +31071,10 @@ function streamsOf(block) {
   const streams = releases.streams;
   return Array.isArray(streams) ? streams : [];
 }
-function declaredStreamsInScope(scope, cwd = process.cwd()) {
-  if (scope === "repo")
-    return streamsOf(resolveRepoConfigBlock(void 0, cwd).block);
-  return streamsOf(loadProjectConfig(cwd));
+async function declaredStreamsInScope(scope, cwd = process.cwd()) {
+  if (scope !== "repo") return streamsOf(loadProjectConfig(cwd));
+  const { block } = await resolveSharedRepoBlock(await getDb(), void 0, cwd);
+  return streamsOf(block);
 }
 
 // src/commands/releases/mergeRepoStreams.ts
@@ -31136,12 +31090,12 @@ function mergeRepoStreams(declared, incoming) {
 }
 
 // src/commands/releases/writeReleaseStreams.ts
-function writeReleaseStreams(incoming, scope) {
+async function writeReleaseStreams(incoming, scope) {
   return writeConfigKeys(
     [
       {
         key: "releases.streams",
-        value: mergeRepoStreams(declaredStreamsInScope(scope), incoming)
+        value: mergeRepoStreams(await declaredStreamsInScope(scope), incoming)
       }
     ],
     scope
@@ -31162,7 +31116,7 @@ function reportWritten(incoming, target) {
     target
   );
 }
-function releasesConfigure(options2 = {}) {
+async function releasesConfigure(options2 = {}) {
   const scope = options2.scope === "repo" ? "repo" : "project";
   const input = readStreamsInput(options2.streams ?? "-");
   if ("error" in input) return fail6(`Could not read --streams: ${input.error}`);
@@ -31173,7 +31127,7 @@ function releasesConfigure(options2 = {}) {
       "The graph does not hold together, so nothing was written:",
       broken
     );
-  const written = writeReleaseStreams(incoming, scope);
+  const written = await writeReleaseStreams(incoming, scope);
   if (!written.ok)
     return fail6(
       "releases.streams does not validate, so nothing was written:",
@@ -31222,7 +31176,7 @@ function registerReleases(parent) {
     "JSON or YAML array of streams to declare; '-' reads stdin"
   ).option(
     "--scope <project|repo>",
-    "project assist.yml or ~/.assist.yml repo block",
+    "project assist.yml or this repo's shared db override",
     "project"
   ).action(releasesConfigure);
 }
@@ -34200,7 +34154,7 @@ async function promptConfigScope() {
         },
         {
           name: "repo",
-          message: "this repo's block in ~/.assist.yml \u2014 personal, as 'config set -g --repo' writes it"
+          message: "this repo's override in the shared db \u2014 personal, seen by every node, as 'config set -g --repo' writes it"
         }
       ]
     }).run()
@@ -34240,7 +34194,7 @@ async function configureConfigKeys(questions, options2 = {}) {
     if (value === void 0) skipped.push(question.key);
     else written.push({ key: question.key, value });
   }
-  const result = writeConfigKeys(written, scope, options2.cwd);
+  const result = await writeConfigKeys(written, scope, options2.cwd);
   if (!result.ok) exitWithConfigErrors(result.errors);
   return { scope, target: result.target, written, skipped };
 }
@@ -41856,6 +41810,13 @@ function broadcast(clients, msg) {
   }
 }
 
+// src/commands/sessions/shared/promptIssueRef.ts
+var issuePrompt = /^Issue ([^\s#]+\/[^\s#]+)#(\d+):/;
+function promptIssueRef(prompt) {
+  const match = prompt ? issuePrompt.exec(prompt) : null;
+  return match ? `${match[1]}#${match[2]}` : void 0;
+}
+
 // src/commands/sessions/daemon/toSessionRunInfo.ts
 function toSessionRunInfo({
   status: status2,
@@ -41956,6 +41917,7 @@ function toSessionInfo(session) {
     lastUserMessage,
     activeViewer,
     activeViewerNode,
+    promptIssue: promptIssueRef(session.initialPrompt),
     joinable: joinRefusal(session) === void 0
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.780.1",
+	"version": "0.781.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {