@staff0rd/assist 0.65.0 → 0.66.1

package/README.md

@@ -66,7 +66,7 @@ After installation, the `assist` command will be available globally.
 - `assist config set <key> <value>` - Set a config value (e.g. commit.push true)
 - `assist config get <key>` - Get a config value
 - `assist config list` - List all config values
-- `assist verify` - Run all verify:* scripts from package.json in parallel
+- `assist verify` - Run all verify:* commands in parallel (from run configs in assist.yml and scripts in package.json)
 - `assist verify init` - Add verify scripts to a project
 - `assist verify hardcoded-colors` - Check for hardcoded hex colors in src/
 - `assist lint` - Run lint checks for conventions not enforced by biomejs

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.65.0",
+  version: "0.66.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -147,9 +147,11 @@ function loadConfig() {
   const merged = { ...globalRaw, ...projectRaw };
   return assistConfigSchema.parse(merged);
 }
-function loadGlobalConfig() {
-  const raw = loadRawConfig(getGlobalConfigPath());
-  return assistConfigSchema.parse(raw);
+function loadProjectConfig() {
+  return loadRawConfig(getConfigPath());
+}
+function loadGlobalConfigRaw() {
+  return loadRawConfig(getGlobalConfigPath());
 }
 function saveGlobalConfig(config) {
   writeFileSync(getGlobalConfigPath(), stringifyYaml(config, { lineWidth: 0 }));
@@ -291,14 +293,10 @@ function exitValidationFailed(issues, key) {
 function validateConfig(updated, key) {
   const result = assistConfigSchema.safeParse(updated);
   if (!result.success) return exitValidationFailed(result.error.issues, key);
-  return result.data;
+  return updated;
 }
 function applyConfigSet(key, coerced) {
-  const updated = setNestedValue(
-    loadConfig(),
-    key,
-    coerced
-  );
+  const updated = setNestedValue(loadProjectConfig(), key, coerced);
   saveConfig(validateConfig(updated, key));
 }
 function configSet(key, value) {
@@ -1333,10 +1331,6 @@ Total: ${lines.length} hardcoded color(s)`);
   }
 }
 
-// src/commands/verify/run/index.ts
-import { spawn } from "child_process";
-import * as path13 from "path";
-
 // src/commands/verify/run/createTimerCallback/printTaskStatuses.ts
 function formatDuration(ms) {
   if (ms < 1e3) {
@@ -1379,41 +1373,87 @@ function initTaskStatuses(scripts) {
   return scripts.map((script) => ({ script, startTime: Date.now() }));
 }
 
-// src/commands/verify/run/index.ts
-function spawnScript(script, cwd) {
-  return spawn("npm", ["run", script], { stdio: "inherit", shell: true, cwd });
-}
-function onScriptClose(script, onComplete, resolve3) {
-  return (code) => {
-    const exitCode = code ?? 1;
-    onComplete?.(exitCode);
-    resolve3({ script, code: exitCode });
-  };
+// src/commands/verify/run/resolveEntries.ts
+import * as path13 from "path";
+function quoteIfNeeded(arg) {
+  return arg.includes(" ") ? `"${arg}"` : arg;
+}
+function buildFullCommand(command, args) {
+  return [quoteIfNeeded(command), ...(args ?? []).map(quoteIfNeeded)].join(" ");
 }
-function runScript(script, cwd, onComplete) {
+function getRunEntries() {
+  const { run: run3 } = loadConfig();
+  if (!run3) return [];
+  return run3.filter((r) => r.name.startsWith("verify:")).map((r) => ({
+    name: r.name,
+    fullCommand: buildFullCommand(r.command, r.args)
+  }));
+}
+function getPackageJsonEntries() {
+  const result = findPackageJsonWithVerifyScripts(process.cwd());
+  if (!result) return [];
+  const cwd = path13.dirname(result.packageJsonPath);
+  return result.verifyScripts.map((script) => ({
+    name: script,
+    fullCommand: `npm run ${script}`,
+    cwd
+  }));
+}
+function resolveEntries() {
+  return [...getRunEntries(), ...getPackageJsonEntries()];
+}
+
+// src/commands/verify/run/spawnCommand.ts
+import { spawn } from "child_process";
+var isClaudeCode = !!process.env.CLAUDECODE;
+function spawnCommand(fullCommand, cwd) {
+  return spawn(fullCommand, [], {
+    stdio: isClaudeCode ? "pipe" : "inherit",
+    shell: true,
+    cwd: cwd ?? process.cwd()
+  });
+}
+function collectOutput(child) {
+  if (!isClaudeCode) return [];
+  const chunks = [];
+  child.stdout?.on("data", (data) => chunks.push(data));
+  child.stderr?.on("data", (data) => chunks.push(data));
+  return chunks;
+}
+function flushIfFailed(exitCode, chunks) {
+  if (exitCode !== 0 && chunks.length > 0) {
+    process.stdout.write(Buffer.concat(chunks));
+  }
+}
+
+// src/commands/verify/run/index.ts
+function runEntry(entry, onComplete) {
   return new Promise((resolve3) => {
-    spawnScript(script, cwd).on(
-      "close",
-      onScriptClose(script, onComplete, resolve3)
-    );
+    const child = spawnCommand(entry.fullCommand, entry.cwd);
+    const chunks = collectOutput(child);
+    child.on("close", (code) => {
+      const exitCode = code ?? 1;
+      flushIfFailed(exitCode, chunks);
+      onComplete?.(exitCode);
+      resolve3({ script: entry.name, code: exitCode });
+    });
   });
 }
-function runAllScripts(verifyScripts, packageDir, timer) {
-  const taskStatuses = initTaskStatuses(verifyScripts);
+function runAllEntries(entries, timer) {
+  const taskStatuses = initTaskStatuses(entries.map((e) => e.name));
   return Promise.all(
-    verifyScripts.map(
-      (script, index) => runScript(
-        script,
-        packageDir,
+    entries.map(
+      (entry, index) => runEntry(
+        entry,
         timer ? createTimerCallback(taskStatuses, index) : void 0
       )
     )
   );
 }
-function printScriptList(scripts) {
-  console.log(`Running ${scripts.length} verify script(s) in parallel:`);
-  for (const script of scripts) {
-    console.log(`  - ${script}`);
+function printEntryList(entries) {
+  console.log(`Running ${entries.length} verify command(s) in parallel:`);
+  for (const entry of entries) {
+    console.log(`  - ${entry.name}`);
   }
 }
 function exitIfFailed(failed) {
@@ -1424,32 +1464,17 @@ function exitIfFailed(failed) {
 function handleResults(results, totalCount) {
   exitIfFailed(results.filter((r) => r.code !== 0));
   console.log(`
-All ${totalCount} verify script(s) passed`);
-}
-function resolveVerifyScripts() {
-  const result = findPackageJsonWithVerifyScripts(process.cwd());
-  if (!result) {
-    console.log("No package.json with verify:* scripts found");
-    return null;
-  }
-  return result;
-}
-function getPackageDir(found) {
-  return path13.dirname(found.packageJsonPath);
-}
-async function executeVerifyScripts(found, timer) {
-  printScriptList(found.verifyScripts);
-  const results = await runAllScripts(
-    found.verifyScripts,
-    getPackageDir(found),
-    timer
-  );
-  handleResults(results, found.verifyScripts.length);
+All ${totalCount} verify command(s) passed`);
 }
 async function run(options2 = {}) {
-  const found = resolveVerifyScripts();
-  if (!found) return;
-  await executeVerifyScripts(found, options2.timer ?? false);
+  const allEntries = resolveEntries();
+  if (allEntries.length === 0) {
+    console.log("No verify commands found");
+    return;
+  }
+  printEntryList(allEntries);
+  const results = await runAllEntries(allEntries, options2.timer ?? false);
+  handleResults(results, allEntries.length);
 }
 
 // src/commands/new/registerNew/initGit.ts
@@ -2917,21 +2942,19 @@ function skip(date) {
     console.log(chalk39.red("Invalid date format. Use YYYY-MM-DD"));
     process.exit(1);
   }
-  const config = loadConfig();
-  const skipDays = config.devlog?.skip?.days ?? [];
+  const config = loadProjectConfig();
+  const devlog = config.devlog ?? {};
+  const skip2 = devlog.skip ?? {};
+  const skipDays = skip2.days ?? [];
   if (skipDays.includes(date)) {
     console.log(chalk39.yellow(`${date} is already in skip list`));
     return;
   }
   skipDays.push(date);
   skipDays.sort();
-  config.devlog = {
-    ...config.devlog,
-    skip: {
-      ...config.devlog?.skip,
-      days: skipDays
-    }
-  };
+  skip2.days = skipDays;
+  devlog.skip = skip2;
+  config.devlog = devlog;
   saveConfig(config);
   console.log(chalk39.green(`Added ${date} to skip list`));
 }
@@ -3125,7 +3148,7 @@ import { join as join14 } from "path";
 import { stringify } from "yaml";
 
 // src/lib/isClaudeCode.ts
-function isClaudeCode() {
+function isClaudeCode2() {
   return process.env.CLAUDECODE !== void 0;
 }
 
@@ -3224,7 +3247,7 @@ function formatForHuman(comment) {
 
 // src/commands/prs/listComments/index.ts
 function formatComment(comment) {
-  return isClaudeCode() ? JSON.stringify(comment) : formatForHuman(comment);
+  return isClaudeCode2() ? JSON.stringify(comment) : formatForHuman(comment);
 }
 function printComments(comments) {
   if (comments.length === 0) {
@@ -3623,7 +3646,7 @@ function getViolations(pattern2, options2 = {}, maxLines = DEFAULT_MAX_LINES) {
 }
 
 // src/commands/refactor/check/index.ts
-function runScript2(script, cwd) {
+function runScript(script, cwd) {
   return new Promise((resolve3) => {
     const child = spawn3("npm", ["run", script], {
       stdio: "pipe",
@@ -3657,7 +3680,7 @@ async function runVerifyQuietly() {
   if (!result) return true;
   const packageDir = path17.dirname(result.packageJsonPath);
   const results = await Promise.all(
-    result.verifyScripts.map((script) => runScript2(script, packageDir))
+    result.verifyScripts.map((script) => runScript(script, packageDir))
   );
   const failed = results.filter((r) => r.code !== 0);
   if (failed.length > 0) {
@@ -4306,7 +4329,7 @@ function validateDirectories(transcript) {
 }
 async function configure() {
   const rl = createReadlineInterface();
-  const config = loadConfig();
+  const config = loadProjectConfig();
   const existing = config.transcript;
   console.log("Configure transcript directories\n");
   if (existing) printExisting(existing);
@@ -4857,7 +4880,7 @@ function registerTranscript(program2) {
 
 // src/commands/registerVerify.ts
 function registerVerify(program2) {
-  const verifyCommand = program2.command("verify").description("Run all verify:* scripts from package.json in parallel").option("--timer", "Show timing information for each task as they complete").action((options2) => run(options2));
+  const verifyCommand = program2.command("verify").description("Run all verify:* commands in parallel").option("--timer", "Show timing information for each task as they complete").action((options2) => run(options2));
   verifyCommand.command("init").description("Add verify scripts to a project").action(init2);
   verifyCommand.command("hardcoded-colors").description("Check for hardcoded hex colors in src/").action(hardcodedColors);
 }
@@ -5030,9 +5053,12 @@ async function promptCredentials(existing) {
 
 // src/commands/roam/auth.ts
 async function auth() {
-  const config = loadGlobalConfig();
-  const { clientId, clientSecret } = await promptCredentials(config.roam);
-  config.roam = { ...config.roam, clientId, clientSecret };
+  const config = loadGlobalConfigRaw();
+  const { clientId, clientSecret } = await promptCredentials(
+    config.roam
+  );
+  const existingRoam = config.roam ?? {};
+  config.roam = { ...existingRoam, clientId, clientSecret };
   saveGlobalConfig(config);
   const state = randomBytes(16).toString("hex");
   console.log(
@@ -5116,7 +5142,7 @@ function requireParsedArgs() {
   return parsed;
 }
 function getOrInitRunList() {
-  const config = loadConfig();
+  const config = loadProjectConfig();
   if (!config.run) config.run = [];
   return { config, runList: config.run };
 }
@@ -5149,12 +5175,12 @@ function add2() {
 }
 
 // src/commands/run/index.ts
-function quoteIfNeeded(arg) {
+function quoteIfNeeded2(arg) {
   return arg.includes(" ") ? `"${arg}"` : arg;
 }
 function buildCommand(command, configArgs, extraArgs) {
   const allArgs = [...configArgs, ...extraArgs];
-  return [quoteIfNeeded(command), ...allArgs.map(quoteIfNeeded)].join(" ");
+  return [quoteIfNeeded2(command), ...allArgs.map(quoteIfNeeded2)].join(" ");
 }
 function printAvailableConfigs(configs) {
   console.error("Available configurations:");
@@ -5184,14 +5210,14 @@ function onSpawnError(err) {
   console.error(`Failed to execute command: ${err.message}`);
   process.exit(1);
 }
-function spawnCommand(fullCommand) {
+function spawnCommand2(fullCommand) {
   const child = spawn4(fullCommand, [], { stdio: "inherit", shell: true });
   child.on("close", (code) => process.exit(code ?? 0));
   child.on("error", onSpawnError);
 }
 function run2(name, args) {
   const runConfig = findRunConfig(name);
-  spawnCommand(buildCommand(runConfig.command, runConfig.args ?? [], args));
+  spawnCommand2(buildCommand(runConfig.command, runConfig.args ?? [], args));
 }
 
 // src/commands/statusLine.ts

package/package.json

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