breakaway 1.0.2-main.25 → 1.0.2-main.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "breakaway",
-  "version": "1.0.2-main.25",
+  "version": "1.0.2-main.26",
   "description": "The task board for you and your coding agents: a Cloudflare Worker, its web app, Taskwarrior sync, and the CLI (npx breakaway).",
   "license": "FSL-1.1-Apache-2.0",
   "type": "module",

package/scripts/tasks/hook-config.js

@@ -42,7 +42,7 @@ function readOptional(path) {
 
 /** This machine's tasks.env, as `{ NAME: value }`. */
 function envFile() {
-  const dir = configDir({ env: process.env, home: homedir(), exists: existsSync });
+  const dir = configDir({ env: process.env, home: homedir() });
   return parseEnvFile(readOptional(join(dir, 'tasks.env')));
 }
 

package/scripts/tasks/message-wait.mjs

@@ -7,7 +7,7 @@
  * quietly, and a message waits for the agent's next turn; its `timeout` (300 s) outlasts the window,
  * because Claude Code kills an async hook at its timeout (CLD-146).
  *
- * Quiet by design: without a claimed task (.task-session), with BREAKAWAY_SESSION_LOG=off (or SAMEWAVE_TASKS_SESSION_LOG=off), or
+ * Quiet by design: without a claimed task (.task-session), with BREAKAWAY_SESSION_LOG=off, or
  * on any error, it exits 0. It writes nothing inside the repository: a cloud session's Stop check
  * would take a dirty file as work to commit.
  */

package/scripts/tasks/repo.js

@@ -1,7 +1,7 @@
 /**
  * Which repository the CLI works in (docs/specs/IDEA-14-multi-repo.md, section 5; CLD-123): the
  * checkout's, from `git remote get-url origin`, matched against the board's registry. `--repo` or
- * BREAKAWAY_REPO (or SAMEWAVE_TASKS_REPO) overrides it. Pure, so it's tested without git or the board.
+ * BREAKAWAY_REPO overrides it. Pure, so it's tested without git or the board.
  */
 
 /**

package/scripts/tasks/session-hook.mjs

@@ -7,7 +7,7 @@
  * additionalContext so Claude gets them on its next turn (docs/specs/IDEA-15-message-a-running-agent.md).
  *
  * Quiet by design: without a claimed task (.task-session, written by `tasks claim`), with
- * BREAKAWAY_SESSION_LOG=off (or SAMEWAVE_TASKS_SESSION_LOG=off), or on any error, it does nothing and exits 0. A post
+ * BREAKAWAY_SESSION_LOG=off, or on any error, it does nothing and exits 0. A post
  * that fails leaves its reason in the temp folder, which the CLI's next command here shows (BRK-86).
  */
 import { boardConfig, claimedTask, dropClaim, projectRoot } from './hook-config.js';

package/scripts/tasks/settings.js

@@ -1,52 +1,38 @@
 /**
  * Which board install the CLI and the session hooks talk to, and the names of their settings (CLD-136,
- * docs/specs/IDEA-13-breakaway.md, section 2). Every setting has a breakaway name (BREAKAWAY_URL) and the
- * name the first install used before breakaway (SAMEWAVE_TASKS_URL), read as a fallback so existing machines,
- * cloud environments, and agents keep working. Pure (the environment, files, and checks come in as arguments),
+ * docs/specs/IDEA-13-breakaway.md, section 2). Pure (the environment, files, and checks come in as arguments),
  * so it's tested without a disk.
  */
-/** Each setting's breakaway name, then the fallback the first install set up. */
+/** Each setting's name, in the environment and in tasks.env (BRK-77 retired the first install's names). */
 export const NAMES = Object.freeze({
-  URL: ['BREAKAWAY_URL', 'SAMEWAVE_TASKS_URL'],
-  TOKEN: ['BREAKAWAY_TOKEN', 'SAMEWAVE_TASKS_TOKEN'],
-  AGENT: ['BREAKAWAY_AGENT', 'SAMEWAVE_AGENT'],
-  REPO: ['BREAKAWAY_REPO', 'SAMEWAVE_TASKS_REPO'],
-  CLIENT_ID: ['BREAKAWAY_CLIENT_ID', 'SAMEWAVE_TASKS_CLIENT_ID'],
-  SECRET: ['BREAKAWAY_SECRET', 'SAMEWAVE_TASKS_SECRET'],
-  SYNC_KEY: ['BREAKAWAY_SYNC_KEY', 'SAMEWAVE_TASKS_SYNC_KEY'],
-  SESSION_LOG: ['BREAKAWAY_SESSION_LOG', 'SAMEWAVE_TASKS_SESSION_LOG'],
+  URL: 'BREAKAWAY_URL',
+  TOKEN: 'BREAKAWAY_TOKEN',
+  AGENT: 'BREAKAWAY_AGENT',
+  REPO: 'BREAKAWAY_REPO',
+  CLIENT_ID: 'BREAKAWAY_CLIENT_ID',
+  SECRET: 'BREAKAWAY_SECRET',
+  SYNC_KEY: 'BREAKAWAY_SYNC_KEY',
+  SESSION_LOG: 'BREAKAWAY_SESSION_LOG',
 });
 
-const LEGACY_NAMES = new Set(Object.values(NAMES).map(([, legacy]) => legacy));
-
 /**
- * A setting's value: from the environment first (either name), then the env file (either name), else
- * `fallback`. The environment always wins, so `BREAKAWAY_URL=… npx breakaway` points one command elsewhere.
+ * A setting's value: from the environment first, then the env file, else `fallback`. The environment always wins,
+ * so `BREAKAWAY_URL=… npx breakaway` points one command elsewhere.
  */
 export function readSetting(key, { env = {}, file = {} }, fallback) {
-  const names = NAMES[key];
-  if (!names) throw new Error(`no setting ${key}`);
-  for (const source of [env, file]) for (const name of names) if (source[name]) return source[name];
-  return fallback;
+  const name = NAMES[key];
+  if (!name) throw new Error(`no setting ${key}`);
+  return env[name] || file[name] || fallback;
 }
 
-/** True when an env file uses the first install's names, so the CLI writes it back with the same ones. */
-export const usesLegacyNames = (file) => Object.keys(file ?? {}).some((name) => LEGACY_NAMES.has(name));
-
-/** A setting's name in an env file the CLI writes: the file's own style, breakaway's for a new one. */
-export const nameFor = (key, legacy) => NAMES[key][legacy ? 1 : 0];
-
 /**
  * This machine's folder for the board (tasks.env, the Taskwarrior credentials, the routines copy):
- * BREAKAWAY_HOME when it's set (one per install, for a machine that uses two), else ~/.config/breakaway,
- * else ~/.config/samewave when only that one exists (a machine set up before breakaway), else ~/.config/breakaway.
+ * BREAKAWAY_HOME when it's set (one per install, for a machine that uses two), else ~/.config/breakaway.
  */
-/** @param {{ env?: Record<string, string | undefined>, home?: string, exists: (path: string) => boolean }} options */
-export function configDir({ env = {}, home, exists }) {
+/** @param {{ env?: Record<string, string | undefined>, home?: string }} options */
+export function configDir({ env = {}, home }) {
   if (env.BREAKAWAY_HOME) return env.BREAKAWAY_HOME.replace(/\/$/u, '');
-  const breakaway = `${home}/.config/breakaway`;
-  const samewave = `${home}/.config/samewave`;
-  return !exists(breakaway) && exists(samewave) ? samewave : breakaway;
+  return `${home}/.config/breakaway`;
 }
 
 /** `path` as a Taskwarrior include line can name it: `~/…` under `home`, else as it is. */
@@ -59,8 +45,7 @@ export function taskrcUrl(text) {
 }
 
 /**
- * The board's base URL, and where it came from: the environment or env file (BREAKAWAY_URL, then
- * SAMEWAVE_TASKS_URL), else the checkout's own .taskrc (`sync.server.url`, so the CLI and Taskwarrior agree),
+ * The board's base URL, and where it came from: the environment or env file (BREAKAWAY_URL), else the checkout's own .taskrc (`sync.server.url`, so the CLI and Taskwarrior agree),
  * else the install's breakaway.config.json (`url`), else null: nothing says which board.
  */
 export function boardUrl({ env = {}, file = {}, taskrc = null, config = null }) {

package/scripts/tasks.mjs

@@ -4,14 +4,13 @@
  * Talks to the board's JSON API; claims there are atomic. See docs/tasks.md.
  *
  * Settings come from the environment, then tasks.env in this machine's folder for the board ($BREAKAWAY_HOME,
- * else ~/.config/breakaway, or ~/.config/samewave where only that one exists). Each has a breakaway name and,
- * as a fallback, the name an install from before breakaway used first (scripts/tasks/settings.js):
- *   BREAKAWAY_TOKEN       SAMEWAVE_TASKS_TOKEN       API token (or the cloud environment's API credential)
- *   BREAKAWAY_URL         SAMEWAVE_TASKS_URL         the board; default: this checkout's .taskrc (sync.server.url),
- *                                                     then breakaway.config.json (tools/tasks/ in a copy), then the legacy install's
- *   BREAKAWAY_AGENT       SAMEWAVE_AGENT             your name on claims (default user@host)
- *   BREAKAWAY_REPO        SAMEWAVE_TASKS_REPO        the repository to work in (default: the checkout's origin)
- *   BREAKAWAY_CLIENT_ID   SAMEWAVE_TASKS_CLIENT_ID   for `setup` (Taskwarrior sync), with BREAKAWAY_SECRET
+ * else ~/.config/breakaway; scripts/tasks/settings.js):
+ *   BREAKAWAY_TOKEN       API token (or the cloud environment's API credential)
+ *   BREAKAWAY_URL         the board; default: this checkout's .taskrc (sync.server.url),
+ *                         then breakaway.config.json (tools/tasks/ in a copy)
+ *   BREAKAWAY_AGENT       your name on claims (default user@host)
+ *   BREAKAWAY_REPO        the repository to work in (default: the checkout's origin)
+ *   BREAKAWAY_CLIENT_ID   for `setup` (Taskwarrior sync), with BREAKAWAY_SECRET
  */
 import { execFileSync, spawnSync } from 'node:child_process';
 import { createPrivateKey, pbkdf2Sync, randomBytes, randomUUID } from 'node:crypto';
@@ -53,19 +52,10 @@ import {
   unknownSubcommand,
 } from './tasks/cli.js';
 import { CLI_VERSION } from '../src/cli-version.js';
-import { LEGACY, parseInstall, secretName } from '../src/install.js';
-import {
-  boardUrl,
-  configDir,
-  nameFor,
-  parseEnvFile,
-  readSetting,
-  taskrcFixes,
-  tildePath,
-  usesLegacyNames,
-} from './tasks/settings.js';
+import { parseInstall, secretName } from '../src/install.js';
+import { NAMES, boardUrl, configDir, parseEnvFile, readSetting, taskrcFixes, tildePath } from './tasks/settings.js';
 
-const CONFIG_DIR = configDir({ env: process.env, home: homedir(), exists: existsSync });
+const CONFIG_DIR = configDir({ env: process.env, home: homedir() });
 const ENV_FILE = join(CONFIG_DIR, 'tasks.env');
 // Every other repository's routine, as agents-connect --repo wrote it to the Secrets Store: the owner's copy,
 // so connecting one more merges instead of dropping the others (the Secrets Store never gives a value back).
@@ -100,12 +90,12 @@ function sharedFile(name) {
 const CONFIG_FILE = sharedFile('breakaway.config.json');
 
 /**
- * The board's install, from breakaway.config.json: its Secrets Store and the prefix of its secrets'
- * names (a legacy install's: SAMEWAVE_TASKS_). Read only by the owner's commands that write secrets; a checkout without
- * the file is a legacy install.
+ * The board's install, from breakaway.config.json: its Secrets Store and the prefix of its secrets' names. Read only by
+ * the owner's commands that write secrets; a checkout without the file gets a new install's defaults, as the package
+ * does (BRK-77 retired the first install's names).
  */
 function installConfig() {
-  if (!existsSync(CONFIG_FILE)) return { ...LEGACY, secretsStore: null };
+  if (!existsSync(CONFIG_FILE)) return parseInstall({});
   try {
     return parseInstall(JSON.parse(readFileSync(CONFIG_FILE, 'utf8')));
   } catch (error) {
@@ -251,7 +241,7 @@ Everywhere: --json for machine-readable output, --as <name> to claim as someone
 Projects: ideas and routines are the board's; repos lists each repository's areas.
 
 Settings: BREAKAWAY_TOKEN, BREAKAWAY_URL, BREAKAWAY_AGENT, BREAKAWAY_REPO, from the environment or tasks.env in
-  $BREAKAWAY_HOME (default ~/.config/breakaway); the first names (SAMEWAVE_TASKS_TOKEN, …) still work.
+  $BREAKAWAY_HOME (default ~/.config/breakaway).
   Without BREAKAWAY_URL the board is this checkout's .taskrc sync.server.url. See docs/tasks.md#another-install.`;
 
 // ---- settings ----------------------------------------------------------------------------
@@ -261,7 +251,7 @@ function readEnvFile() {
 }
 
 const fileEnv = readEnvFile();
-/** A setting by its key in NAMES (scripts/tasks/settings.js): `TOKEN` reads BREAKAWAY_TOKEN, then SAMEWAVE_TASKS_TOKEN. */
+/** A setting by its key in NAMES (scripts/tasks/settings.js): `TOKEN` reads BREAKAWAY_TOKEN. */
 const setting = (key, fallback) => readSetting(key, { env: process.env, file: fileEnv }, fallback);
 const BOARD = boardUrl({
   env: process.env,
@@ -271,9 +261,8 @@ const BOARD = boardUrl({
 });
 /** The board's address, or null when nothing says which board (the commands then ask for one). */
 const BASE = BOARD.url;
-/** The names this machine's tasks.env uses: the first ones in a file that has them, else breakaway's. */
-const LEGACY_ENV = usesLegacyNames(fileEnv);
-const envName = (key) => nameFor(key, LEGACY_ENV);
+/** A setting's name in tasks.env: `TOKEN` is BREAKAWAY_TOKEN. */
+const envName = (key) => NAMES[key];
 // In a cloud session, go through its proxy: that's where the board's API credential is added.
 routeThroughSessionProxy();
 
@@ -442,7 +431,7 @@ const enc = encodeURIComponent;
 
 let repoContext;
 /**
- * {slug, registry}: the repository this checkout works in, from --repo, SAMEWAVE_TASKS_REPO, or the
+ * {slug, registry}: the repository this checkout works in, from --repo, BREAKAWAY_REPO, or the
  * origin remote. slug is null on a board without repositories or in a checkout it doesn't know, and
  * then everything works as before.
  */
@@ -1415,7 +1404,7 @@ const commands = {
   /**
    * Owner, once per repository: its routine's /fire URL and token (asked for here, never on a command line).
    * The default repository's go in its two secrets, as always; `--repo <slug>` puts another's in
-   * the install's ROUTINES secret (SAMEWAVE_TASKS_ROUTINES on an install from before breakaway), JSON keyed by slug, merged with this machine's copy of the others.
+   * the install's ROUTINES secret (BREAKAWAY_ROUTINES with breakaway's prefix), JSON keyed by slug, merged with this machine's copy of the others.
    */
   async 'agents-connect'() {
     const { repos, default: fallback } = await call('GET', 'repos');
@@ -1896,7 +1885,7 @@ function promoteEnvFile() {
 
 /**
  * Pipes each value into `wrangler secrets-store secret update` (never on a command line). `values` are keyed by
- * the part of the secret's name after the install's prefix (`API_TOKEN` is SAMEWAVE_TASKS_API_TOKEN on an install from before breakaway).
+ * the part of the secret's name after the install's prefix (`API_TOKEN` is BREAKAWAY_API_TOKEN with breakaway's prefix).
  * An install without a Secrets Store (the Deploy to Cloudflare button's, CLD-139) keeps them as Worker secrets.
  */
 function updateSecretsStore(values) {

package/src/cli-version.js

@@ -4,5 +4,5 @@
  * and how to update it. scripts/tasks/version.test.js fails when the copied files change and this doesn't:
  * so it lives in the board's package (CLD-135) and the CLI imports it from here.
  */
-export const CLI_VERSION = 46;
-export const CLI_FINGERPRINT = '0eaad403bcd23b2e';
+export const CLI_VERSION = 47;
+export const CLI_FINGERPRINT = 'e779f7d4ae3104e4';

package/src/redact.js

@@ -6,9 +6,10 @@
 const PATTERNS = [
   // Private keys, whole blocks.
   [/-----BEGIN [A-Z ]*PRIVATE KEY-----[\s\S]*?-----END [A-Z ]*PRIVATE KEY-----/gu, '[redacted key]'],
-  // An install's own settings (breakaway's prefix and the legacy one): KEY=value where the name says it's secret.
+  // Settings whose name says they're secret, KEY=value, under any prefix: breakaway's, an install's own (it picks its
+  // secrets' prefix), Cloudflare's, GitHub's, and the rest (BRK-77).
   [
-    /\b((?:BREAKAWAY|SAMEWAVE|CLOUDFLARE|GITHUB|ANTHROPIC)_[A-Z0-9_]*(?:TOKEN|SECRET|KEY|PASSWORD)[A-Z0-9_]*\s*[=:]\s*)("[^"]*"|'[^']*'|\S+)/gu,
+    /\b([A-Z][A-Z0-9]*_[A-Z0-9_]*(?:TOKEN|SECRET|KEY|PASSWORD)[A-Z0-9_]*\s*[=:]\s*)("[^"]*"|'[^']*'|\S+)/gu,
     '$1[redacted]',
   ],
   // Anthropic, GitHub, Slack-style tokens.