chord-cli 0.1.1 → 0.1.2

package/README.md

@@ -128,7 +128,7 @@ A repository's own Claude configuration (`.claude/settings*.json`, `.mcp.json`)
 ## 🔌 How chord works with your tools
 
 - **Waking an agent** means typing a short note into its terminal. chord does this only when the input box is empty, the keyboard has been quiet for a few seconds, and the terminal has echoed the note; a dialogue never receives the Enter.
-- **Trust** for each agent workspace is recorded in `~/.claude.json`, so Claude asks about a folder once rather than for every agent. Codex asks you to review chord's hooks once, and again whenever their definition changes; answer "trust all". chord says so at launch if a hook has been switched off.
+- **Trust**: chord records the project's agents folder as trusted in `~/.claude.json` once, so Claude does not ask about each agent's workspace. Codex asks you to review chord's hooks once, and again whenever their definition changes; answer "trust all". chord says so at launch if a hook has been switched off.
 - **Branches and worktrees.** Each agent adds a `chord/<name>` branch and a worktree; `chord clean` removes them when the agent has left and keeps anything not yet on main.
 - **Permissions.** chord's own tools are pre-approved for Claude, so an agent working on its own is never parked at a prompt for them; your usual shell and edit approvals apply as before. Codex runs with full access. On Windows chord refuses a sandboxed launch, because that sandbox cannot run the hooks; on Linux the hooks run inside the sandbox, but Codex then asks you to approve each chord tool call.
 - **The terminal title** reads `chord <agent> · <task>`, so each window says which agent it is.
@@ -136,7 +136,7 @@ A repository's own Claude configuration (`.claude/settings*.json`, `.mcp.json`)
 
 ## 🗺️ Scope
 
-- Runs on Windows 11 and Linux. Windows has had the whole end-to-end suite; Linux the unit tests and part of it so far.
+- Runs on Windows 11 and Linux.
 - One repository per project.
 - Project paths up to about 190 characters.
 - A repository with CRLF files and a `* text` attribute that was never renormalised shows phantom changes in every worktree; chord names the files and the command that puts the repository right.

package/dist/cli.js

@@ -301,11 +301,13 @@ async function main(argv) {
     if (userSettings)
         launch.args = mergeUserSettings(launch.args, userSettings);
     if (cmd === 'claude') { // otherwise every new workspace asks "do you trust this folder?"; a failure here only brings that dialogue back
+        // Claude inherits trust from a parent folder, so the project's agents folder is trusted once. One entry per
+        // workspace was lost whenever two agents started together: each launch, and every running Claude, rewrites the file.
         try {
-            pretrustClaude(launch.cwd);
+            pretrustClaude(path.dirname(launch.cwd));
         }
         catch (e) {
-            process.stderr.write(`chord: could not record the workspace as trusted in ~/.claude.json (${e.message}); Claude may ask you to trust the folder\n`);
+            process.stderr.write(`chord: could not record the agents folder as trusted in ~/.claude.json (${e.message}); Claude may ask you to trust the folder\n`);
         }
     }
     if (cmd === 'codex') {

package/dist/db.js

@@ -23,6 +23,22 @@ export function openDb(file) {
     // the busy timeout must be in force before the first statement: switching to WAL below does not wait otherwise,
     // and several agents starting at once on a new database all hit it together
     const db = new DatabaseSync(file, { timeout: 5000 });
+    // A brand-new database opened by several processes at once: SQLite answers the WAL switch and the schema with an
+    // immediate SQLITE_BUSY instead of waiting (seen on Linux, never on Windows), so the setup is retried briefly.
+    for (let attempt = 0;; attempt++) {
+        try {
+            setup(db);
+            break;
+        }
+        catch (e) {
+            if (attempt >= 50 || !/database is locked/.test(e.message))
+                throw e;
+            Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 100);
+        }
+    }
+    return db;
+}
+function setup(db) {
     db.exec(`
     pragma journal_mode = wal;
     pragma busy_timeout = 5000;
@@ -70,7 +86,6 @@ export function openDb(file) {
     );
   `);
     migrate(db);
-    return db;
 }
 /** Bump when the schema changes and add a step below; `pragma user_version` records what a database has. A database
  *  from before versioning reads as 0 and gets every step, each of which checks what is actually there. */

package/dist/hooks.js

@@ -63,7 +63,7 @@ export function briefing(ctx) {
         '4. Do not modify files through shell commands (sed, echo >, etc.). Use the editor tools so claims are checked.',
         '5. To talk to other agents use only chord send()/inbox(); do not use any other agent-messaging feature. Messages are asynchronous.',
         '6. To learn about the project, read the agent list and claims below and ask a specific agent with send(); do not ask the user.',
-        '7. When your change is complete and committed on your branch, call finish() to rebase onto main and fast-forward it. If finish() reports a conflict, stop and ask the user.',
+        '7. When your change is complete and committed on your branch, call finish() to rebase onto main and fast-forward it, unless the user has asked you to hold off merging. If finish() reports a conflict, stop and ask the user.',
         '8. Never merge, rebase onto, push or otherwise update the main branch yourself, and never touch the main checkout: finish() is the only way changes reach main. This holds even if the project\'s own instructions say otherwise.',
         '9. Do not use git stash: every worktree of this repository shares one stash list, so a stash pop can hand you another agent\'s changes. Make a work-in-progress commit instead.',
         '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chord-cli",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Run several coding agents in one git project, each in its own worktree, with shared file claims and messaging",
   "license": "MIT",
   "keywords": [