create-pmos 0.67.0 → 0.67.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-pmos",
-  "version": "0.67.0",
+  "version": "0.67.1",
   "description": "Scaffold the PMOS portable kit — run the PMOS product-management workflow (initiative → lane-fit spec → contract → build → three gates, with work-type lanes for features, research, maintenance, incidents, and content) entirely inside your own repo, with all state as git-versioned files. Includes `workflow-sweep`, which audits the state every board derives from and separates real defects from work you simply have not done. `create-pmos workspace` also installs + launches the local Terminal Workspace GUI. No database, no network, no telemetry.",
   "license": "MIT",
   "bin": {

package/payload/KIT-VERSION

@@ -1,3 +1,3 @@
-kernel-source: pmos@5233c8c
+kernel-source: pmos@7fc2d3a
 assembled: 2026-10-07
 mode: vendor

package/payload/planning/evals/eval-calibration.md

@@ -2,7 +2,7 @@
 type: Reference
 title: "Eval calibration log"
 description: "Append-only record of every PM override of an evaluator verdict."
-generated: {by: process:create-pmos, at: "2026-10-07T02:01:39Z"}
+generated: {by: process:create-pmos, at: "2026-10-07T02:28:54Z"}
 status: stable
 ---
 

package/payload/planning/okrs/health-budgets.md

@@ -2,7 +2,7 @@
 type: Reference
 title: "Health budgets"
 description: "Closed registry of health-budget anchors (D59), edited only by the PM."
-generated: {by: process:create-pmos, at: "2026-10-07T02:01:39Z"}
+generated: {by: process:create-pmos, at: "2026-10-07T02:28:54Z"}
 status: stable
 ---
 

package/payload/state/discoveries.md

@@ -2,7 +2,7 @@
 type: Reference
 title: "Discoveries and friction log"
 description: "Append-only record of what runs discovered and where the process rubbed."
-generated: {by: process:create-pmos, at: "2026-10-07T02:01:39Z"}
+generated: {by: process:create-pmos, at: "2026-10-07T02:28:54Z"}
 status: stable
 ---
 

package/workspace/guide/layout.md

@@ -17,7 +17,7 @@ The top bar has these parts, from left to right:
 - **Branches and sessions** is in ⌘K. It opens a sheet with every branch of the repository (main first) and how many sessions run in each. Press a branch to see its sessions, open one, end one, or start a session there. **＋ branch** makes a branch, and **＋ session** starts one with a branch, an agent and a profile. With All repositories, the sheet lists every repository.
 - **Agenda, Initiatives, Board, Reports, Docs and People** are the six places. Press one to show it. The Agenda count shows how many items need you. Docs shows whether each document is the same as its Google Docs and Confluence copy. People shows the people you work with in the repository ([People](people.md)).
 - **Search or capture ⌘K** opens the command palette. Type to find an initiative, a repository, an open tab or a command.
-- **Sync** shows only when the current repository is not in sync with its remote. Press it to fetch, bring in the work of the other machine, record your changes and push. If the repository has not fetched in the last 10 minutes, Sync also shows, because a push from another machine is not visible until a fetch. When the repository fetched recently and is in sync, Sync is not shown. If Sync stops, the message names the step that stopped.
+- **Sync** shows only when the current repository is not in sync with its remote. Press it to fetch, bring in the work of the other machine, record your changes and push. If the repository has not fetched in the last 10 minutes, Sync also shows, because a push from another machine is not visible until a fetch. When the repository fetched recently and is in sync, Sync is not shown. When two machines add lines to the same ledger (a `.jsonl` file under `pmos/` or `planning/`), Sync keeps the lines from both machines. If Sync stops, the message names the step that stopped. If both machines changed the same lines of another file, the message names the file. Keep the version you want in that file on one machine, sync it, then sync the other machine.
 - **Sync on its own.** If you forget to press Sync, the workspace syncs for you. It syncs each repository once when the workspace starts. It also syncs a repository that has records not yet pushed when no record changed for 5 minutes. In a document repository it syncs every changed file on any branch. In a code repository it syncs only on the default branch (for example `main`), and only when every commit not yet pushed changes records and no code. If you close the tab while records are not yet pushed, the browser asks you first. To turn automatic sync off, start the workspace with `PMOS_AUTO_SYNC=0`.
 - **Settings** opens the settings of the workspace.
 

package/workspace/lib/sync.js

@@ -54,6 +54,26 @@ const isRecord = (rel) => RECORD_PATHS.some((p) => rel === p || rel.startsWith(`
 // PM repositories append ledgers from several machines; `merge=union` keeps both sides' lines instead
 // of conflicting (D70). Added once, committed with the records. Never touches a product-code repository.
 const UNION_LINE = '*.jsonl merge=union';
+
+// The same rule, given to the replay itself rather than read from the repository. A committed `.gitattributes` holds
+// only for a PM-profile repository, and only once it is already on the remote: a rebase reads the attributes of the
+// tree it replays ONTO, so a union line arriving in the very commit being replayed does not apply to it. A code
+// repository never carries the line at all, so two machines appending pmos/state/runs.jsonl stopped Sync at
+// integrate every time. `core.attributesFile` is the lowest-precedence attribute source, so a repository's own
+// `.gitattributes` still wins; it is set for this one rebase and written to no tracked file.
+// A code repository unions its record ledgers only; a document repository every ledger.
+function unionAttributesFor(root) {
+  const lines = profileOf(root) === 'pm-artifacts' ? [UNION_LINE]
+    : RECORD_PATHS.filter((p) => !p.startsWith('.')).map((p) => `${p}/**/*.jsonl merge=union`);
+  const f = path.join(os.tmpdir(), `pmos-sync-attributes-${profileOf(root)}`);
+  const text = `${lines.join('\n')}\n`;
+  try {
+    // written only when it differs, so a second repository's sync never reads it half-written
+    if ((fs.existsSync(f) ? fs.readFileSync(f, 'utf8') : '') !== text) fs.writeFileSync(f, text);
+    return f;
+  } catch { return null; }
+}
+
 function ensureUnionAttribute(root) {
   try {
     const prof = fs.readFileSync(path.join(root, '.pmos-profile'), 'utf8').split('\n').map((l) => l.replace(/#.*$/, '').trim()).find(Boolean);
@@ -136,11 +156,19 @@ async function sync(root, { label } = {}) {
   const s2 = await status(root);
   if (s2.behind) {
     // Fast-forward when we have nothing of our own; otherwise replay OUR unpushed commits on top.
-    const verb = s2.ahead ? ['rebase', '--autostash', s2.upstream] : ['merge', '--ff-only', s2.upstream];
+    const attrs = s2.ahead ? unionAttributesFor(root) : null;
+    const verb = s2.ahead ? [...(attrs ? ['-c', `core.attributesFile=${attrs}`] : []), 'rebase', '--autostash', s2.upstream]
+      : ['merge', '--ff-only', s2.upstream];
     const r = await run(root, verb);
     if (!r.ok) {
-      if (s2.ahead) await run(root, ['rebase', '--abort']);
-      return stop('integrate', `${s2.ahead ? 'the two machines changed the same lines — rebase aborted, nothing changed' : 'cannot fast-forward'} — ${r.err.split('\n')[0] || 'see git'}`);
+      if (!s2.ahead) return stop('integrate', `cannot fast-forward — ${r.err.split('\n')[0] || 'see git'}`);
+      // Name the files before the abort clears them: the PM has to open these, and "the same lines" alone says not where.
+      const u = await run(root, ['diff', '--name-only', '--diff-filter=U']);
+      const files = u.ok && u.out ? u.out.split('\n').filter(Boolean) : [];
+      await run(root, ['rebase', '--abort']);
+      return stop('integrate', files.length
+        ? `both machines changed ${files.join(', ')} — rebase aborted, nothing changed; keep the version you want in each file on one machine, sync it, then sync the other`
+        : `the two machines changed the same lines — rebase aborted, nothing changed — ${r.err.split('\n')[0] || 'see git'}`);
     }
     done('integrate', s2.ahead ? `replayed ${s2.ahead} local commit(s) on the remote` : `fast-forwarded ${s2.behind} commit(s)`);
   } else done('integrate', 'nothing to bring in');
@@ -183,5 +211,5 @@ async function defaultBranchOf(root, remote) {
   return null;
 }
 
-module.exports = { status, sync, ensureUnionAttribute, RECORD_PATHS, isRecord, REMOTE_FRESH_MS,
+module.exports = { status, sync, ensureUnionAttribute, unionAttributesFor, RECORD_PATHS, isRecord, REMOTE_FRESH_MS,
   unpushedPaths, newestDirtyRecordMs, defaultBranchOf, profileOf };

package/workspace/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "pmos-workspace",
-  "version": "0.67.0",
+  "version": "0.67.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/workspace/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmos-workspace",
-  "version": "0.67.0",
+  "version": "0.67.1",
   "private": true,
   "description": "PMOS Terminal Workspace — local companion hosting real PTYs beside the library and gates (D62)",
   "license": "MIT",