threadnote 1.1.4 → 1.1.6

package/README.md

@@ -12,6 +12,14 @@ It is intentionally scoped to curated docs, memories, skills, and handoffs.
 **Walkthrough:** https://kashkovsky.github.io/threadnote/  
 **Wiki:** https://github.com/Kashkovsky/threadnote/wiki
 
+## Quickstart
+
+```bash
+curl -fsSL https://raw.githubusercontent.com/Kashkovsky/threadnote/main/scripts/install.sh | sh
+threadnote mcp-install claude --apply   # or codex / cursor / copilot
+threadnote doctor --dry-run
+```
+
 ## Real-World Uses
 
 **Want to continue work in a fresh agent session?**  

package/dist/mcp_server.cjs

@@ -36192,6 +36192,7 @@ function grepUrisFromJson(output) {
     return [];
   }
 }
+var RECALL_CATEGORY_ORDER = ["memories", "resources", "skills"];
 function recallSnippet(value) {
   if (typeof value !== "string") {
     return "";
@@ -36217,7 +36218,7 @@ function parseRecallHits(output, options = {}) {
       return [];
     }
     const hits = [];
-    for (const key of ["memories", "resources", "skills"]) {
+    for (const key of RECALL_CATEGORY_ORDER) {
       const items = result[key];
       if (!Array.isArray(items)) {
         continue;
@@ -36230,6 +36231,7 @@ function parseRecallHits(output, options = {}) {
           continue;
         }
         hits.push({
+          category: key,
           contextType: typeof item.context_type === "string" ? item.context_type : "result",
           score: typeof item.score === "number" ? item.score : 0,
           snippet: recallSnippet(item.abstract ?? item.overview),
@@ -36253,7 +36255,9 @@ function mergeRecallHits(passes) {
       }
     }
   }
-  return [...byDocument.values()].sort((left, right) => right.score - left.score);
+  return [...byDocument.values()].sort(
+    (left, right) => RECALL_CATEGORY_ORDER.indexOf(left.category) - RECALL_CATEGORY_ORDER.indexOf(right.category) || right.score - left.score
+  );
 }
 function formatRecallHits(hits, maxHits) {
   if (hits.length === 0) {

package/dist/threadnote.cjs

@@ -4348,6 +4348,7 @@ function grepUrisFromJson(output2) {
     return [];
   }
 }
+var RECALL_CATEGORY_ORDER = ["memories", "resources", "skills"];
 function recallSnippet(value) {
   if (typeof value !== "string") {
     return "";
@@ -4373,7 +4374,7 @@ function parseRecallHits(output2, options = {}) {
       return [];
     }
     const hits = [];
-    for (const key of ["memories", "resources", "skills"]) {
+    for (const key of RECALL_CATEGORY_ORDER) {
       const items = result[key];
       if (!Array.isArray(items)) {
         continue;
@@ -4386,6 +4387,7 @@ function parseRecallHits(output2, options = {}) {
           continue;
         }
         hits.push({
+          category: key,
           contextType: typeof item.context_type === "string" ? item.context_type : "result",
           score: typeof item.score === "number" ? item.score : 0,
           snippet: recallSnippet(item.abstract ?? item.overview),
@@ -4409,7 +4411,9 @@ function mergeRecallHits(passes) {
       }
     }
   }
-  return [...byDocument.values()].sort((left, right) => right.score - left.score);
+  return [...byDocument.values()].sort(
+    (left, right) => RECALL_CATEGORY_ORDER.indexOf(left.category) - RECALL_CATEGORY_ORDER.indexOf(right.category) || right.score - left.score
+  );
 }
 function formatRecallHits(hits, maxHits) {
   if (hits.length === 0) {
@@ -8498,6 +8502,7 @@ var SHARED_SEGMENT = "shared";
 var SHAREABLE_MEMORY_KIND_DIRS = ["durable"];
 var SHAREABLE_ARTIFACT_DIR = "agent-artifacts";
 var SHAREABLE_TOP_LEVEL_DIRS = [...SHAREABLE_MEMORY_KIND_DIRS, SHAREABLE_ARTIFACT_DIR];
+var SHAREABLE_ROOT_FILES = ["README.md", "AGENTS.md", "CLAUDE.md", "SKILL.md", ".gitignore"];
 var ARTIFACT_INSTALL_METADATA_VERSION = 1;
 var AUTO_SHARE_FETCH_INTERVAL_MS = 5 * 60 * 1e3;
 var DEFAULT_GIT_REMOTE_NAME = "origin";
@@ -8826,13 +8831,29 @@ async function runShareSync(config, options) {
     }
     const message = options.message ?? `share: sync ${(/* @__PURE__ */ new Date()).toISOString()}`;
     await stageShareableChanges(dryRun, git, worktree);
-    await maybeRun(dryRun, git, ["-C", worktree, "commit", "-m", message], { allowFailure: true });
+    const commitResult = await maybeRun(dryRun, git, ["-C", worktree, "commit", "-m", message], { allowFailure: true });
+    if (!dryRun && commitResult && commitResult.exitCode !== 0) {
+      if (await hasUncommittedChanges(worktree)) {
+        throw new Error(
+          `Worktree ${worktree} has uncommitted changes that Threadnote did not auto-commit. Commit, remove, or ignore the remaining files, then rerun \`threadnote share sync\`.
+Git said: ${commitResult.stderr.trim() || commitResult.stdout.trim() || "unknown git commit error"}`
+        );
+      }
+      throw new Error(
+        `Could not auto-commit share worktree changes in ${worktree}: ${commitResult.stderr.trim() || commitResult.stdout.trim() || "unknown git commit error"}`
+      );
+    }
+    if (!dryRun && await hasUncommittedChanges(worktree)) {
+      throw new Error(
+        `Worktree ${worktree} still has uncommitted changes after staging Threadnote shareable files. Commit, remove, or ignore the remaining files, then rerun \`threadnote share sync\`.`
+      );
+    }
   }
   const beforeRev = await gitOutput(worktree, ["rev-parse", "HEAD"], dryRun);
   await maybeRun(dryRun, git, ["-C", worktree, "fetch", DEFAULT_GIT_REMOTE_NAME]);
-  const pullResult = dryRun ? void 0 : await runCommand(git, ["-C", worktree, "pull", "--rebase", DEFAULT_GIT_REMOTE_NAME], { allowFailure: true });
+  const pullResult = dryRun ? void 0 : await runCommand(git, ["-C", worktree, "rebase", "@{u}"], { allowFailure: true });
   if (dryRun) {
-    console.log(`Would run: ${formatShellCommand(git, ["-C", worktree, "pull", "--rebase", DEFAULT_GIT_REMOTE_NAME])}`);
+    console.log(`Would run: ${formatShellCommand(git, ["-C", worktree, "rebase", "@{u}"])}`);
   } else if (pullResult && pullResult.exitCode !== 0) {
     if (await exists((0, import_node_path6.join)(team.config.gitdir, "rebase-merge")) || await exists((0, import_node_path6.join)(team.config.gitdir, "rebase-apply"))) {
       throw new Error(
@@ -8841,7 +8862,7 @@ Resolve the conflicts in-place, run \`git -C ${worktree} rebase --continue\` (or
       );
     }
     throw new Error(
-      `git pull --rebase failed in ${worktree}: ${pullResult.stderr.trim() || pullResult.stdout.trim() || "unknown error"}`
+      `git rebase @{u} failed in ${worktree}: ${pullResult.stderr.trim() || pullResult.stdout.trim() || "unknown error"}`
     );
   }
   const afterRev = await gitOutput(worktree, ["rev-parse", "HEAD"], dryRun);
@@ -8917,8 +8938,31 @@ async function runShareSyncQuiet(config, state, options) {
   return void 0;
 }
 async function stageShareableChanges(dryRun, git, worktree) {
-  const pathspecs = [":(top)README.md", ":(top).gitignore", ...SHAREABLE_TOP_LEVEL_DIRS.map((dir) => `:(top)${dir}`)];
-  await maybeRun(dryRun, git, ["-C", worktree, "add", "--", ...pathspecs], { allowFailure: true });
+  const pathspecs = await existingShareablePathspecs(git, worktree);
+  if (pathspecs.length === 0) {
+    return;
+  }
+  await maybeRun(dryRun, git, ["-C", worktree, "add", "-A", "--", ...pathspecs], { allowFailure: true });
+}
+async function existingShareablePathspecs(git, worktree) {
+  const rootFiles = await Promise.all(
+    SHAREABLE_ROOT_FILES.map(
+      async (file) => await hasWorktreeOrTrackedPath(git, worktree, file) ? `:(top)${file}` : void 0
+    )
+  );
+  const topLevelDirs = await Promise.all(
+    SHAREABLE_TOP_LEVEL_DIRS.map(
+      async (dir) => await hasWorktreeOrTrackedPath(git, worktree, dir) ? `:(top)${dir}` : void 0
+    )
+  );
+  return [...rootFiles, ...topLevelDirs].filter((pathspec) => pathspec !== void 0);
+}
+async function hasWorktreeOrTrackedPath(git, worktree, relativePath) {
+  if (await exists((0, import_node_path6.join)(worktree, relativePath))) {
+    return true;
+  }
+  const result = await runCommand(git, ["-C", worktree, "ls-files", "--", relativePath], { allowFailure: true });
+  return result.exitCode === 0 && result.stdout.trim().length > 0;
 }
 async function publishShareGitChange(worktree, relativePath, commitMessage, options = {}) {
   const dryRun = options.dryRun === true;

package/docs/share.md

@@ -194,12 +194,15 @@ threadnote share sync --team friends   # other team
 threadnote share sync --no-push        # pull only
 ```
 
-`share sync` will auto-commit any uncommitted edits in the worktree, fetch and
-rebase from the remote, reindex pulled markdown files into OpenViking (so
-`recall` finds them immediately), and push. Pass `--no-auto-commit` to refuse
-syncing when the worktree is dirty. Automatic recall/read sync never commits a
-dirty shared worktree; it warns and leaves that case for explicit
-`threadnote share sync`.
+`share sync` will auto-commit edits in Threadnote-managed share paths, fetch and
+rebase onto the configured upstream, reindex pulled markdown files into
+OpenViking (so `recall` finds them immediately), and push. Managed share paths
+are root guidance/metadata files (`README.md`, `AGENTS.md`, `CLAUDE.md`,
+`SKILL.md`, `.gitignore`) plus `durable/` and `agent-artifacts/`. If other dirty
+files remain after staging those paths, sync stops before rebase so you can
+commit, remove, or ignore them. Pass `--no-auto-commit` to refuse syncing when
+the worktree is dirty. Automatic recall/read sync never commits a dirty shared
+worktree; it warns and leaves that case for explicit `threadnote share sync`.
 
 ### Take a memory back
 
@@ -280,8 +283,8 @@ updates the git `origin` URL and verifies it with `git fetch`.
 
 ## Conflict resolution
 
-`share sync` uses `git pull --rebase` against the remote. When git can't merge
-cleanly:
+`share sync` fetches the remote, then rebases onto the branch's configured
+upstream. When git can't merge cleanly:
 
 1. The pull command reports the conflict and leaves the worktree in a
    rebase-in-progress state.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "threadnote",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "type": "commonjs",
   "main": "dist/threadnote.cjs",
   "description": "Shared local context and handoffs for development agents",
@@ -48,7 +48,7 @@
     "lint": "eslint \"src/**/*.{ts,tsx}\" \"test/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.{ts,tsx}\" \"test/**/*.ts\" --fix",
     "prepare": "husky",
-    "precommit": "npm run lint && npm run prettier:check && npm run test",
+    "precommit": "npm run lint && npm run prettier:write && npm run test",
     "prepack": "npm run build",
     "prettier:check": "prettier --check \"**/*.{ts,tsx,js,cjs,json,md,yaml,yml,css,html}\"",
     "prettier:write": "prettier --write \"**/*.{ts,tsx,js,cjs,json,md,yaml,yml,css,html}\"",