@kevin0181/memoc 1.1.4 → 1.1.11

package/README.md

@@ -82,6 +82,14 @@ npx @kevin0181/memoc init
 # Re-scan project and refresh managed sections
 npx @kevin0181/memoc update
 
+# Shared repo activity tracking
+npx @kevin0181/memoc actor
+npx @kevin0181/memoc actor set neneee
+npx @kevin0181/memoc work "Auth refresh fix" --from-git
+npx @kevin0181/memoc activity
+npx @kevin0181/memoc activity --write
+npx @kevin0181/memoc doctor
+
 # Print current status in ~10 lines
 npx @kevin0181/memoc summary
 
@@ -105,7 +113,7 @@ npx @kevin0181/memoc tokens
 # Archive and compact an oversized startup summary
 npx @kevin0181/memoc trim-summary
 
-# Archive old log entries to keep log.md small
+# Legacy: archive old log.md entries before deleting/migrating log.md
 npx @kevin0181/memoc compress
 
 # Add the same protocol to another agent's entry file
@@ -132,11 +140,11 @@ Run it from the project root. It preserves existing project memory, including:
 - `.memoc/03-decisions.md`
 - `.memoc/04-handoff.md`
 - `.memoc/06-project-rules.md`
-- `.memoc/log.md`
+- Legacy `.memoc/log.md` if present
 - `.memoc/systems/`
 - `.memoc/wiki/`
 
-It refreshes the managed blocks, project-local wrappers, runtime copy, PATH helpers, and missing template files. If `memoc` is not on PATH after upgrading, keep using:
+It refreshes the managed blocks, project-local wrappers, runtime copy, PATH helpers, and memoc-owned protocol templates. User-owned memory files such as `session-summary.md`, `03-decisions.md`, `04-handoff.md`, `06-project-rules.md`, and wiki topic/source pages are preserved. If `memoc` is not on PATH after upgrading, keep using:
 
 ```bash
 # Windows
@@ -164,7 +172,9 @@ llms.txt                                     ← LLM-facing project map
   03-decisions.md                            ← Durable decision log
   04-handoff.md                              ← Resume context, verified/unverified
   06-project-rules.md                        ← User preferences
-  log.md                                     ← Append-only activity log
+  activity.md                                ← Short shared activity index
+  actors/                                    ← Actor profiles for shared repos
+  worklog/                                   ← Per-actor work records to reduce conflicts
   raw/                                       ← Immutable source material, not a startup read
   systems/                                   ← Subsystem docs
   wiki/                                      ← Synthesized knowledge base
@@ -182,10 +192,14 @@ Every entry file (`CLAUDE.md`, `AGENTS.md`, `.cursorrules`, etc.) gets the same
 ## Session Start
 - [ ] Read `.memoc/session-summary.md`
 - [ ] `.pending` exists? → review changed files → update memory if needed → delete it
+- [ ] If `memoc` is not found, use the project-local wrapper.
 
 ## Before Opening More Files
 - [ ] Run `memoc search "<query>"` first
 - [ ] Open on demand: `02` status · `04` resume · `06` rules · `llms.txt` map
+- [ ] Use `memoc grep "<query>"` only when memory is not enough.
+- [ ] For durable source/wiki work, use `memoc ingest`, `memoc note`, and `memoc lint-wiki`.
+- [ ] In shared repos, record meaningful work with `memoc work "<title>"`.
 - [ ] Keep output small: `summary`, `search --limit`, `search --snippets`
 
 ## Before Finishing _(update only applicable files; skip Q&A / throwaway exploration)_
@@ -194,6 +208,8 @@ Every entry file (`CLAUDE.md`, `AGENTS.md`, `.cursorrules`, etc.) gets the same
 - [ ] Work incomplete or risky → `04-handoff.md` (verified commands, unverified items, next steps)
 - [ ] Rule/preference set → `06-project-rules.md`
 - [ ] Wiki/systems work → read `skills/project-memory-maintainer/SKILL.md`
+- [ ] Shared repo work → prefer `memoc work "<title>" --from-git`; run `memoc activity --write` only when regenerating indexes.
+- [ ] Keep `session-summary.md` replace-only; completed work belongs in actor worklogs.
 ```
 
 The checklist tells agents exactly when to update, which file to update, and what to record — so nothing gets missed.
@@ -212,7 +228,7 @@ Startup cost is kept minimal by design.
 
 Everything else is on-demand. Use `memoc tokens` to see the live breakdown for your project.
 
-`session-summary.md` is a replace-only startup snapshot, not a timeline. If it grows beyond the warning threshold, run `memoc trim-summary`; completed history belongs in `.memoc/log.md`, and unfinished/risky resume detail belongs in `.memoc/04-handoff.md`.
+`session-summary.md` is a replace-only startup snapshot, not a timeline. If it grows beyond the warning threshold, run `memoc trim-summary`; completed history belongs in `.memoc/worklog/<actor>/YYYY-MM/`, and unfinished/risky resume detail belongs in `.memoc/04-handoff.md`.
 
 ---
 
@@ -245,6 +261,24 @@ Add more agents on demand:
 
 Running `update` refreshes managed blocks in all existing agent files.
 
+## Shared Repos
+
+Use `memoc work "<title>" --from-git` for meaningful work in shared repositories. It creates a new actor-scoped file under `.memoc/worklog/<actor>/YYYY-MM/`, prefills branch and changed files from git, and avoids append conflicts in shared files.
+
+Actor detection order:
+
+1. `MEMOC_ACTOR`
+2. `.memoc/local/actor` from `memoc actor set <name>`
+3. `git config user.name`
+4. `git config user.email`
+5. OS username
+
+`.memoc/local/` is ignored by git so each machine can keep its own actor setting.
+
+`activity.md`, `actors/README.md`, and `worklog/README.md` are regenerated indexes. Run `memoc activity --write` when you want to refresh them from worklog files.
+
+`log.md` is legacy. New installs do not create it, and shared activity should live in worklog files. On upgrade, an existing `.memoc/log.md` is moved to `.memoc/raw/legacy-log.md` so old history is preserved but no longer part of the normal memory flow.
+
 ---
 
 ## Supported Stacks
@@ -260,7 +294,7 @@ Node.js · Next.js · React · Vue · Svelte · Angular · Nuxt · Astro · Expr
 - **New project** — scaffolds all memory files with sensible defaults.
 - **Existing project** — detects your stack and fills in real project info (name, scripts, config files).
 - **Already initialized** — `init` injects the managed block without touching your existing content. `update` re-scans and refreshes project-specific sections.
-- **Long-running projects** — run `compress` to archive old `log.md` entries when the file grows large.
+- **Long-running projects** — use actor worklogs for history; `compress` remains only for old `log.md` files.
 
 ---
 

package/bin/cli.js

@@ -209,6 +209,12 @@ function write(filePath, content) {
   fs.writeFileSync(filePath, content, 'utf8');
 }
 
+function writeChanged(filePath, content) {
+  if (fs.existsSync(filePath) && fs.readFileSync(filePath, 'utf8') === content) return false;
+  write(filePath, content);
+  return true;
+}
+
 function slugify(value, fallback = 'note') {
   const slug = String(value || '')
     .toLowerCase()
@@ -228,21 +234,155 @@ function uniquePath(filePath) {
   return `${base}-${i}${ext}`;
 }
 
+function archiveLegacyLog(dir, mark) {
+  const logPath = path.join(dir, '.memoc', 'log.md');
+  if (!fs.existsSync(logPath)) {
+    mark('skip', '.memoc/log.md (legacy; no file)');
+    return;
+  }
+  const archivePath = uniquePath(path.join(dir, '.memoc', 'raw', 'legacy-log.md'));
+  fs.mkdirSync(path.dirname(archivePath), { recursive: true });
+  fs.renameSync(logPath, archivePath);
+  mark('move', `${path.relative(dir, logPath)} -> ${path.relative(dir, archivePath)}`);
+}
+
+function migrateLegacyLogReferences(filePath) {
+  if (!fs.existsSync(filePath)) return false;
+  const before = fs.readFileSync(filePath, 'utf8');
+  let after = before
+    .replace(/- \[Project Log\]\(log\.md\)\n/g, '- [Activity](activity.md)\n- [Worklog](worklog/README.md)\n')
+    .replace(/\| `\.memoc\/log\.md` \| For append-only history \|\n/g, '| `.memoc/activity.md` | Generated worklog index |\n| `.memoc/worklog/` | Actor-scoped work history |\n')
+    .replace(/See `\.memoc\/log\.md` for full history\./g, 'See `.memoc/worklog/` for full shared activity history.')
+    .replace(/See `\.memoc\/log\.md`\./g, 'See `.memoc/worklog/` and generated `.memoc/activity.md`.')
+    .replace(/- \[ \] `\.memoc\/log\.md` has a new entry for meaningful work\./g, '- [ ] Meaningful shared work has a `.memoc/worklog/<actor>/YYYY-MM/*.md` entry.')
+    .replace(/Append `\.memoc\/log\.md` for meaningful changes, decisions, and handoffs\./g, 'Create a short actor worklog with `memoc work "<title>" --from-git` for meaningful changes, decisions, and handoffs.')
+    .replace(/Keep completed history in `\.memoc\/log\.md`; keep current-state files short\./g, 'Keep completed history in actor worklogs; keep current-state files short.')
+    .replace(/Append `\.memoc\/log\.md`\./g, 'If the change is meaningful shared work, run `memoc work "<title>" --from-git`.');
+  if (after === before) return false;
+  write(filePath, after);
+  return true;
+}
+
 function markdownTitle(src, fallback) {
   const m = String(src || '').match(/^#\s+(.+)$/m);
   return m ? m[1].trim() : fallback;
 }
 
-function tplMemocCmdWrapper(cliPath = runtimeCliPath()) {
-  return `@echo off\r\nnode "${escapeCmdPath(cliPath)}" %*\r\n`;
+function execGitConfig(dir, key) {
+  try {
+    return require('child_process')
+      .execFileSync('git', ['config', '--get', key], { cwd: dir, encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] })
+      .trim();
+  } catch {
+    return '';
+  }
+}
+
+function actorFile(dir) {
+  return path.join(dir, '.memoc', 'local', 'actor');
+}
+
+function sanitizeActor(value) {
+  return slugify(String(value || '').replace(/@.*$/, ''), 'unknown');
+}
+
+function detectActor(dir) {
+  if (process.env.MEMOC_ACTOR) return { actor: sanitizeActor(process.env.MEMOC_ACTOR), source: 'MEMOC_ACTOR' };
+  const localPath = actorFile(dir);
+  try {
+    const local = fs.readFileSync(localPath, 'utf8').trim();
+    if (local) return { actor: sanitizeActor(local), source: '.memoc/local/actor' };
+  } catch {}
+  const gitUser = execGitConfig(dir, 'user.name');
+  if (gitUser) return { actor: sanitizeActor(gitUser), source: 'git config user.name' };
+  const gitEmail = execGitConfig(dir, 'user.email');
+  if (gitEmail) return { actor: sanitizeActor(gitEmail), source: 'git config user.email' };
+  const osUser = process.env.USER || process.env.USERNAME || process.env.LOGNAME;
+  if (osUser) return { actor: sanitizeActor(osUser), source: 'OS user' };
+  return { actor: 'unknown', source: 'fallback' };
 }
 
-function tplMemocPs1Wrapper(cliPath = runtimeCliPath()) {
-  return `& node ${psSingleQuote(cliPath)} @args\nexit $LASTEXITCODE\n`;
+function gitBranch(dir) {
+  try {
+    return require('child_process')
+      .execFileSync('git', ['branch', '--show-current'], { cwd: dir, encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] })
+      .trim() || 'unknown';
+  } catch {
+    return 'unknown';
+  }
 }
 
-function tplMemocShWrapper(cliPath = runtimeCliPath()) {
-  return `#!/bin/sh\nexec node ${shellSingleQuote(cliPath)} "$@"\n`;
+function gitStatusFiles(dir) {
+  try {
+    const out = require('child_process')
+      .execFileSync('git', ['status', '--short'], { cwd: dir, encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] })
+      .trim();
+    if (!out) return [];
+    return out.split(/\r?\n/)
+      .map(line => line.slice(3).trim())
+      .filter(Boolean)
+      .filter(file => !file.startsWith('.memoc/worklog/') && !file.startsWith('.memoc/activity.md'))
+      .slice(0, 12);
+  } catch {
+    return [];
+  }
+}
+
+function tplMemocCmdWrapper() {
+  return [
+    '@echo off',
+    'set "MEMOC_RUNTIME=%MEMOC_RUNTIME_DIR%"',
+    'if "%MEMOC_RUNTIME%"=="" (',
+    '  if not "%LOCALAPPDATA%"=="" (',
+    '    set "MEMOC_RUNTIME=%LOCALAPPDATA%\\memoc\\runtime"',
+    '  ) else (',
+    '    set "MEMOC_RUNTIME=%USERPROFILE%\\AppData\\Local\\memoc\\runtime"',
+    '  )',
+    ')',
+    'set "MEMOC_CLI=%MEMOC_RUNTIME%\\bin\\cli.js"',
+    'if exist "%MEMOC_CLI%" (',
+    '  node "%MEMOC_CLI%" %*',
+    ') else (',
+    '  npx @kevin0181/memoc@latest %*',
+    ')',
+    'exit /b %ERRORLEVEL%',
+    '',
+  ].join('\r\n');
+}
+
+function tplMemocPs1Wrapper() {
+  return [
+    '$runtime = $env:MEMOC_RUNTIME_DIR',
+    'if (-not $runtime) {',
+    '  if ($env:LOCALAPPDATA) { $runtime = Join-Path $env:LOCALAPPDATA "memoc\\runtime" }',
+    '  else { $runtime = Join-Path $env:USERPROFILE "AppData\\Local\\memoc\\runtime" }',
+    '}',
+    '$cli = Join-Path $runtime "bin\\cli.js"',
+    'if (Test-Path $cli) {',
+    '  & node $cli @args',
+    '} else {',
+    '  & npx @kevin0181/memoc@latest @args',
+    '}',
+    'exit $LASTEXITCODE',
+    '',
+  ].join('\n');
+}
+
+function tplMemocShWrapper() {
+  return [
+    '#!/bin/sh',
+    'if [ -n "$MEMOC_RUNTIME_DIR" ]; then',
+    '  memoc_runtime="$MEMOC_RUNTIME_DIR"',
+    'else',
+    '  memoc_runtime="${HOME:-$PWD}/.local/share/memoc/runtime"',
+    'fi',
+    'memoc_cli="$memoc_runtime/bin/cli.js"',
+    'if [ -f "$memoc_cli" ]; then',
+    '  exec node "$memoc_cli" "$@"',
+    'fi',
+    'exec npx @kevin0181/memoc@latest "$@"',
+    '',
+  ].join('\n');
 }
 
 function defaultUserBinDir() {
@@ -274,11 +414,11 @@ function tplEnvSh() {
 }
 
 function ensurePathHelpers(dir, mark) {
-  const cliPath = ensureRuntimeInstall(mark);
+  ensureRuntimeInstall(mark);
   const files = [
-    [path.join(dir, '.memoc', 'bin', 'memoc.cmd'), () => tplMemocCmdWrapper(cliPath), false],
-    [path.join(dir, '.memoc', 'bin', 'memoc.ps1'), () => tplMemocPs1Wrapper(cliPath), false],
-    [path.join(dir, '.memoc', 'bin', 'memoc'), () => tplMemocShWrapper(cliPath), true],
+    [path.join(dir, '.memoc', 'bin', 'memoc.cmd'), tplMemocCmdWrapper, false],
+    [path.join(dir, '.memoc', 'bin', 'memoc.ps1'), tplMemocPs1Wrapper, false],
+    [path.join(dir, '.memoc', 'bin', 'memoc'), tplMemocShWrapper, true],
     [path.join(dir, '.memoc', 'env.ps1'), tplEnvPs1, false],
     [path.join(dir, '.memoc', 'env.sh'), tplEnvSh, true],
   ];
@@ -293,15 +433,16 @@ function ensurePathHelpers(dir, mark) {
 
 function ensureUserLauncher(mark) {
   const userBin = defaultUserBinDir();
-  writeLaunchers(userBin, mark, 'user bin', ensureRuntimeInstall(mark));
+  ensureRuntimeInstall(mark);
+  writeLaunchers(userBin, mark, 'user bin');
   return userBin;
 }
 
-function writeLaunchers(binDir, mark, label, cliPath = ensureRuntimeInstall(mark)) {
+function writeLaunchers(binDir, mark, label) {
   const files = [
-    [path.join(binDir, 'memoc.cmd'), () => tplMemocCmdWrapper(cliPath), false],
-    [path.join(binDir, 'memoc.ps1'), () => tplMemocPs1Wrapper(cliPath), false],
-    [path.join(binDir, 'memoc'), () => tplMemocShWrapper(cliPath), true],
+    [path.join(binDir, 'memoc.cmd'), tplMemocCmdWrapper, false],
+    [path.join(binDir, 'memoc.ps1'), tplMemocPs1Wrapper, false],
+    [path.join(binDir, 'memoc'), tplMemocShWrapper, true],
   ];
 
   for (const [fp, tpl, executable] of files) {
@@ -398,7 +539,8 @@ function ensureCurrentPathLauncher(mark) {
     mark('skip', 'active PATH launcher (no writable PATH directory found)');
     return false;
   }
-  writeLaunchers(target, mark, 'active PATH', ensureRuntimeInstall(mark));
+  ensureRuntimeInstall(mark);
+  writeLaunchers(target, mark, 'active PATH');
   return true;
 }
 
@@ -631,6 +773,7 @@ function managedBlock() {
 - [ ] If memory search is not enough, search project files with \`memoc grep "<query>" --limit 5\` (or wrapper fallback)
 - [ ] If asked to refresh/update memoc project memory, run \`memoc update\` first; this refreshes managed sections, wiki links, and Obsidian tags.
 - [ ] For durable source material use \`memoc ingest <path-or-url>\`; for durable analysis/query results use \`memoc note "<title>"\`; after wiki edits run \`memoc lint-wiki\`.
+- [ ] In shared repos, record meaningful work with \`memoc work "<title>"\`; actor defaults to \`MEMOC_ACTOR\`, local actor, git user, git email, or OS user.
 - [ ] Keep output small: \`summary\`, \`search --limit\`, \`grep --limit\`, \`--snippets\`
 
 ## Before Finishing _(update only applicable files; skip Q&A / throwaway exploration)_
@@ -640,7 +783,8 @@ function managedBlock() {
 - [ ] Rule/preference set? Update \`06-project-rules.md\`
 - [ ] Wiki/systems work? Read \`skills/project-memory-maintainer/SKILL.md\`
 - [ ] User asked to update memoc/project memory? Run \`memoc update\`, then update the smallest relevant agent-owned memory files.
-- [ ] Keep \`session-summary.md\` as a replace-only snapshot under 800B; move completed history to \`log.md\` and resume details to \`04-handoff.md\`. If it grew, run \`memoc trim-summary\`.
+- [ ] Shared repo work? Prefer \`memoc work "<title>" --from-git\` over appending shared files; run \`memoc activity --write\` only when regenerating indexes.
+- [ ] Keep \`session-summary.md\` as a replace-only snapshot under 800B; move completed work to actor worklogs and resume risks to \`04-handoff.md\`. If it grew, run \`memoc trim-summary\`.
 ${MGMT_E}`;
 }
 
@@ -675,8 +819,8 @@ function coreLlmsInner() {
 - [Project Brief](.memoc/00-project-brief.md): short identity and direction.
 - [Workflow](.memoc/01-agent-workflow.md): update trigger matrix.
 - [Decisions](.memoc/03-decisions.md): durable decisions.
-- [Log](.memoc/log.md): append-only history.
 - [Systems](.memoc/systems/README.md): subsystem docs.
+- [Activity](.memoc/activity.md): generated worklog index.
 - [Raw Sources](.memoc/raw/README.md): immutable source material; do not read by default.
 - [Wiki](.memoc/wiki/index.md): synthesized knowledge.`;
 }
@@ -848,6 +992,12 @@ function obsidianFrontmatterSpec(relPath) {
   } else if (rel.startsWith('.memoc/raw/')) {
     type = 'raw';
     tags.push('memoc/raw');
+  } else if (rel.startsWith('.memoc/worklog/')) {
+    type = 'worklog';
+    tags.push('memoc/worklog');
+  } else if (rel.startsWith('.memoc/actors/')) {
+    type = 'actor';
+    tags.push('memoc/actor');
   } else if (rel.startsWith('skills/project-memory-maintainer/')) {
     type = 'skill';
     tags.push('memoc/skill');
@@ -864,10 +1014,18 @@ function obsidianFrontmatterSpec(relPath) {
 function mergeYamlFrontmatter(src, spec) {
   const fm = parseYamlFrontmatter(src);
   if (!fm) {
-    return `${formatMemocFrontmatter(spec)}\n${src}`;
+    return `${formatMemocFrontmatter(spec)}\n${String(src || '').replace(/^\uFEFF/, '')}`;
+  }
+
+  let body = fm.body;
+  let rest = String(src || '').slice(fm.end).replace(/^\uFEFF/, '');
+  const nested = parseYamlFrontmatter(rest);
+  if (nested) {
+    body = `${nested.body}\n${body}`;
+    rest = rest.slice(nested.end).replace(/^\uFEFF/, '');
   }
 
-  const lines = fm.body.split(/\r?\n/);
+  const lines = body.split(/\r?\n/);
   const existingTags = readYamlTags(lines);
   const mergedTags = [...new Set([...existingTags, ...spec.tags])];
   const nextLines = mergeYamlScalar(lines, 'memoc', 'true');
@@ -880,14 +1038,16 @@ function mergeYamlFrontmatter(src, spec) {
   mergeYamlTags(nextLines, mergedTags);
 
   const nextFm = ['---', ...nextLines, '---'].join('\n');
-  return nextFm + src.slice(fm.end);
+  return `${nextFm}\n${rest.replace(/^\r?\n/, '')}`;
 }
 
 function parseYamlFrontmatter(src) {
-  if (!src.startsWith('---\n') && !src.startsWith('---\r\n')) return null;
-  const m = src.match(/^---\r?\n([\s\S]*?)\r?\n---\r?\n?/);
+  const text = String(src || '').replace(/^\uFEFF/, '');
+  const offset = text.length === src.length ? 0 : 1;
+  if (!text.startsWith('---\n') && !text.startsWith('---\r\n')) return null;
+  const m = text.match(/^---\r?\n([\s\S]*?)\r?\n---\r?\n?/);
   if (!m) return null;
-  return { body: m[1], end: m[0].length };
+  return { body: m[1], end: m[0].length + offset };
 }
 
 function formatMemocFrontmatter(spec) {
@@ -1097,7 +1257,9 @@ ${SNAP_E}
 - [Done Checklist](05-done-checklist.md)
 - [Project Rules](06-project-rules.md)
 - [Session Summary](session-summary.md)
-- [Project Log](log.md)
+- [Activity](activity.md)
+- [Actors](actors/README.md)
+- [Worklog](worklog/README.md)
 - [Wiki Index](wiki/index.md)
 - [Raw Sources](raw/README.md)
 - [Systems Index](systems/README.md)
@@ -1137,7 +1299,7 @@ _None yet._
 
 ## Completed Tasks
 
-See \`.memoc/log.md\` for full history.
+See \`.memoc/worklog/\` for full shared activity history.
 
 ## Commands
 
@@ -1149,7 +1311,7 @@ _None yet._
 
 ## Change Log
 
-See \`.memoc/log.md\`.
+See \`.memoc/worklog/\` and generated \`.memoc/activity.md\`.
 `;
 }
 
@@ -1157,7 +1319,7 @@ function tplSessionSummary() {
   return `# Session Summary
 Last: ${nowISO()}
 Replace this file instead of appending to it. Keep total size <800B and each section ≤3 bullets.
-Completed history belongs in \`log.md\`; incomplete/risky resume detail belongs in \`04-handoff.md\`.
+Completed history belongs in actor worklogs; incomplete/risky resume detail belongs in \`04-handoff.md\`.
 Agent-owned — updated by you, not by \`memoc update\`.
 
 ## Status
@@ -1194,7 +1356,6 @@ On-demand reference only. The entry-file managed block is authoritative.
 | \`.memoc/01-agent-workflow.md\` | When update routing is unclear |
 | \`.memoc/05-done-checklist.md\` | Before finishing substantial work |
 | \`.memoc/03-decisions.md\` | When a durable decision was made |
-| \`.memoc/log.md\` | For append-only history |
 | \`.memoc/memoc-usage.md\` | For command details |
 | \`.memoc/systems/*.md\` | Before touching a specific subsystem |
 | \`.memoc/wiki/*.md\` | For synthesized project knowledge |
@@ -1227,15 +1388,16 @@ Shared protocol for any coding agent.
 | Trigger | Update |
 | --- | --- |
 | User asks "update memoc", "refresh project memory", or similar | Run \`memoc update\` first, then update relevant agent-owned memory files |
-| User creates or changes a requirement | \`02-current-project-state.md\`, \`06-project-rules.md\`, \`log.md\` |
-| Code, config, data, or assets changed | \`02-current-project-state.md\`, relevant \`systems/*.md\`, \`log.md\` |
+| User creates or changes a requirement | \`02-current-project-state.md\`, \`06-project-rules.md\`, \`memoc work "<title>" --from-git\` |
+| Code, config, data, or assets changed | \`02-current-project-state.md\`, relevant \`systems/*.md\`, \`memoc work "<title>" --from-git\` |
 | Architecture or system behavior changed | relevant \`systems/*.md\`, \`03-decisions.md\` |
 | A decision should affect future agents | \`03-decisions.md\`, \`02-current-project-state.md\` |
-| Work is substantial enough to resume later | \`04-handoff.md\`, \`02-current-project-state.md\`, \`log.md\` |
+| Work is substantial enough to resume later | \`04-handoff.md\`, \`02-current-project-state.md\`, \`memoc work "<title>" --from-git\` |
 | Durable knowledge was learned | \`wiki/*.md\`, \`wiki/index.md\` |
 | Source material should feed the wiki | \`memoc ingest <path-or-url>\`, then synthesize affected \`wiki/topics/*.md\` |
 | A useful query answer should persist | \`memoc note "<title>"\`, then link related sources/topics |
-| \`session-summary.md\` exceeds 800B or starts accumulating history | Run \`memoc trim-summary\`; move history to \`log.md\`, resume details to \`04-handoff.md\` |
+| Shared repo work should be traceable | \`memoc work "<title>"\`; avoid appending long details to shared core files |
+| \`session-summary.md\` exceeds 800B or starts accumulating history | Run \`memoc trim-summary\`; move completed history to worklog, resume details to \`04-handoff.md\` |
 
 ## Usually No Update Needed
 
@@ -1250,7 +1412,7 @@ Shared protocol for any coding agent.
 - \`02-current-project-state.md\`: current status, tasks, commands, recent notes.
 - \`04-handoff.md\`: resume context, blockers, verified/unverified checks.
 - \`03-decisions.md\`: append durable decisions only.
-- \`log.md\`: full history; keep bulky completed work here.
+- \`worklog/<actor>/YYYY-MM/*.md\`: actor-scoped append-by-new-file activity records for shared repos.
 - \`systems/*.md\` and \`wiki/*.md\`: on-demand durable knowledge.
 `;
 }
@@ -1322,7 +1484,7 @@ Run through this before saying substantial work is complete.
 - [ ] \`.memoc/02-current-project-state.md\` reflects the new status.
 - [ ] \`.memoc/03-decisions.md\` updated if a durable decision was made.
 - [ ] \`.memoc/04-handoff.md\` updated if work is incomplete or risky.
-- [ ] \`.memoc/log.md\` has a new entry for meaningful work.
+- [ ] Meaningful shared work has a \`.memoc/worklog/<actor>/YYYY-MM/*.md\` entry.
 - [ ] Relevant \`.memoc/systems/*.md\` or wiki pages updated.
 
 ## Communication
@@ -1347,7 +1509,7 @@ Durable user and project preferences live here. Update when the user gives a rul
 ## Agent Behavior Preferences
 
 - Be factual and operational in memory docs.
-- Keep logs concise; do not paste temporary command output unless it changes future work.
+- Keep memory notes concise; do not paste temporary command output unless it changes future work.
 - Preserve user changes and avoid reverting unrelated work.
 - State unverified parts honestly in the final answer and handoff.
 
@@ -1360,9 +1522,75 @@ _None yet._
 function tplLog() {
   return `# Project Log
 
-Append-only chronological log for project memory updates.
+Legacy file. New memoc activity belongs in actor worklogs under \`.memoc/worklog/\`.
 
-## [${nowISO()}] init | Initialized memoc memory structure.
+This file is no longer created for new projects. Existing projects may delete it after migrating useful entries to worklogs.
+`;
+}
+
+function tplActivity() {
+  return `# Activity
+
+Shared activity index for memoc work logs.
+
+## How To Use
+
+- Use \`memoc work "<title>"\` after meaningful work so shared repos get conflict-light per-actor records.
+- Keep this file short; detailed work belongs in [worklog](worklog/README.md).
+- Actor is detected from \`MEMOC_ACTOR\`, \`.memoc/local/actor\`, git config, git email, or OS user.
+
+## Recent Work
+
+_None yet._
+
+## Related
+
+- [Actors](actors/README.md)
+- [Worklog](worklog/README.md)
+`;
+}
+
+function tplActorsReadme() {
+  return `# Actors
+
+People or agents that update memoc in this shared repo.
+
+## Actor Detection
+
+1. \`MEMOC_ACTOR\`
+2. \`.memoc/local/actor\` set by \`memoc actor set <name>\`
+3. \`git config user.name\`
+4. \`git config user.email\`
+5. OS username
+
+\`.memoc/local/\` is ignored by git so each machine can keep its own actor setting.
+
+## Actors
+
+_None yet. Use \`memoc actor set <name>\` or \`memoc work "<title>"\`._
+`;
+}
+
+function tplWorklogReadme() {
+  return `# Worklog
+
+Conflict-light per-actor work records.
+
+## Rules
+
+- Prefer creating new worklog files over appending shared core memory files.
+- Keep \`session-summary.md\` as the tiny current snapshot.
+- Put detailed completed work here; put only team-critical unfinished risk in \`04-handoff.md\`.
+
+## Layout
+
+\`\`\`text
+worklog/<actor>/YYYY-MM/YYYYMMDDTHHMM-title.md
+\`\`\`
+
+## Recent Work
+
+_None yet._
 `;
 }
 
@@ -1388,6 +1616,14 @@ memoc upgrade
 memoc update
 memoc trim-summary
 
+# Shared repo actor/work tracking
+memoc actor
+memoc actor set neneee
+memoc work "Auth refresh fix" --from-git
+memoc activity
+memoc activity --write
+memoc doctor
+
 # Tiny status overview
 memoc summary
 
@@ -1420,6 +1656,12 @@ Use \`memoc search\` for known concepts, changed areas, decisions, tasks, or han
 
 Raw files under \`.memoc/raw/\` are intentionally not part of normal memory search. Open them only through a linked source record when provenance is needed.
 
+## Shared Repo Activity
+
+Use \`memoc work "<title>" --from-git\` to create conflict-light activity records under \`.memoc/worklog/<actor>/YYYY-MM/\`. The command prefills actor, branch, timestamp, and changed files from git so agents only need to fill short Summary/Verification notes when useful. Actor is detected in this order: \`MEMOC_ACTOR\`, \`.memoc/local/actor\`, \`git config user.name\`, \`git config user.email\`, OS username. Use \`memoc actor set <name>\` to store a local actor name without committing it.
+
+\`.memoc/activity.md\`, \`.memoc/worklog/README.md\`, and \`.memoc/actors/README.md\` are regenerated indexes. Run \`memoc activity --write\` to rebuild them from worklog/actor files instead of appending to them during every task.
+
 ## When To Run Memory Updates
 
 Use \`memoc update\` or \`skills/project-memory-maintainer/SKILL.md\` when:
@@ -1431,12 +1673,13 @@ Use \`memoc update\` or \`skills/project-memory-maintainer/SKILL.md\` when:
 - A decision was made that future agents should not revisit blindly.
 - Work is partial, multi-step, blocked, or likely to be resumed by another agent.
 - New durable knowledge belongs in \`.memoc/wiki/\` or a subsystem doc.
+- Shared work should be traceable without causing conflicts.
 
 Usually skip for pure Q&A, throwaway exploration, or tiny edits with no future impact.
 
-When the user asks for a general memoc/project-memory refresh, run \`memoc update\` first. It refreshes managed sections, reconnects default wiki scaffold links, and applies Obsidian frontmatter tags. Then update only the agent-owned files whose content actually changed, such as \`.memoc/session-summary.md\`, \`.memoc/02-current-project-state.md\`, \`.memoc/04-handoff.md\`, \`.memoc/wiki/index.md\`, or \`.memoc/log.md\`.
+When the user asks for a general memoc/project-memory refresh, run \`memoc update\` first. It refreshes managed sections, reconnects default wiki scaffold links, and applies Obsidian frontmatter tags. Then update only the agent-owned files whose content actually changed, such as \`.memoc/session-summary.md\`, \`.memoc/02-current-project-state.md\`, \`.memoc/04-handoff.md\`, \`.memoc/wiki/index.md\`, or actor worklogs.
 
-\`.memoc/session-summary.md\` is a startup snapshot, not a timeline. Rewrite it in place, do not append old work. If it exceeds 800B, run \`memoc trim-summary\`; it archives the previous summary and rewrites a compact version. Put completed history in \`.memoc/log.md\`, and put unfinished/risky resume detail in \`.memoc/04-handoff.md\`.
+\`.memoc/session-summary.md\` is a startup snapshot, not a timeline. Rewrite it in place, do not append old work. If it exceeds 800B, run \`memoc trim-summary\`; it archives the previous summary and rewrites a compact version. Put completed history in actor worklogs, and put unfinished/risky resume detail in \`.memoc/04-handoff.md\`.
 
 ## Updating The Wiki
 
@@ -1450,7 +1693,7 @@ Create a new Markdown file under \`.memoc/wiki/\` when synthesized knowledge sho
 After creating or editing wiki pages:
 1. Update \`.memoc/wiki/index.md\`.
 2. Run \`memoc lint-wiki\`.
-3. Append \`.memoc/log.md\`.
+3. If the change is meaningful shared work, run \`memoc work "<title>" --from-git\`.
 
 Useful scaffolds:
 
@@ -1590,7 +1833,6 @@ _None yet. Use \`memoc note "<title>"\` for durable analysis or query results th
 - [Agent Index](../00-agent-index.md)
 - [Project Brief](../00-project-brief.md)
 - [Current Project State](../02-current-project-state.md)
-- [Project Log](../log.md)
 `;
 }
 
@@ -1774,14 +2016,16 @@ Use this local skill after meaningful project work so future agents can continue
 - Update \`.memoc/04-handoff.md\` before ending substantial work.
 - Check \`.memoc/05-done-checklist.md\` before saying substantial work is complete.
 - Update \`.memoc/06-project-rules.md\` when the user gives durable preferences.
-- Append \`.memoc/log.md\` for meaningful changes, decisions, and handoffs.
+- Create a short actor worklog with \`memoc work "<title>" --from-git\` for meaningful changes, decisions, and handoffs.
 - Create or update \`.memoc/systems/*.md\` when a subsystem needs durable explanation.
 - Create or update \`.memoc/wiki/*.md\` when synthesized knowledge should compound over time.
 - Use \`memoc ingest <path-or-url>\` for source material and \`memoc note "<title>"\` for durable query results or analysis.
+- Use \`memoc work "<title>" --from-git\` for meaningful shared-repo work so details are saved in actor-scoped worklog files instead of causing shared-file conflicts.
 - Keep the wiki graph connected: update \`.memoc/wiki/index.md\`, add relative Markdown links between related pages, and include a \`## Related\` section on every new wiki page.
 - Run \`memoc lint-wiki\` after wiki/source/topic edits and address broken links before finishing.
-- Keep completed history in \`.memoc/log.md\`; keep current-state files short.
-- Move completed session details out of \`session-summary.md\` into \`log.md\`; move incomplete/risky resume details into \`04-handoff.md\`.
+- Keep completed history in actor worklogs; keep current-state files short.
+- Move completed session details out of \`session-summary.md\` into \`.memoc/worklog/<actor>/YYYY-MM/\`; move incomplete/risky resume details into \`04-handoff.md\`.
+- In shared repos, do not use \`log.md\`; prefer new files under \`.memoc/worklog/<actor>/YYYY-MM/\` and regenerate \`.memoc/activity.md\` with \`memoc activity --write\`.
 - Keep tool output small; prefer \`summary\`, file-only search, \`--limit\`, and targeted reads.
 
 ## Wiki Link Rules
@@ -1890,17 +2134,16 @@ function ensureClaudeStopHookFile(dir, mark) {
 
 function ensurePendingGitignore(dir, mark) {
   const gitignorePath = path.join(dir, '.gitignore');
-  const PENDING_ENTRY = '.memoc/.pending';
+  const entries = ['.memoc/.pending', '.memoc/local/'];
   const gitignoreContent = fs.existsSync(gitignorePath)
     ? fs.readFileSync(gitignorePath, 'utf8') : '';
-  const hasPendingEntry = gitignoreContent
-    .split(/\r?\n/)
-    .some(line => line.trim() === PENDING_ENTRY);
-  if (!hasPendingEntry) {
-    fs.appendFileSync(gitignorePath, (gitignoreContent.endsWith('\n') ? '' : '\n') + PENDING_ENTRY + '\n', 'utf8');
-    mark('update', '.gitignore (.memoc/.pending added)');
+  const lines = gitignoreContent.split(/\r?\n/).map(line => line.trim());
+  const missing = entries.filter(entry => !lines.includes(entry));
+  if (missing.length) {
+    fs.appendFileSync(gitignorePath, (gitignoreContent.endsWith('\n') ? '' : '\n') + missing.join('\n') + '\n', 'utf8');
+    mark('update', `.gitignore (${missing.join(', ')} added)`);
   } else {
-    mark('skip', '.gitignore (.memoc/.pending already present)');
+    mark('skip', '.gitignore (memoc local entries already present)');
   }
 }
 
@@ -1975,7 +2218,9 @@ function run(dir, forceUpdate, action = 'update') {
       [path.join(memDir, '04-handoff.md'),             tplHandoff],
       [path.join(memDir, '05-done-checklist.md'),      tplDoneChecklist],
       [path.join(memDir, '06-project-rules.md'),       tplProjectRules],
-      [path.join(memDir, 'log.md'),                    tplLog],
+      [path.join(memDir, 'activity.md'),               tplActivity],
+      [path.join(memDir, 'actors/README.md'),          tplActorsReadme],
+      [path.join(memDir, 'worklog/README.md'),         tplWorklogReadme],
       [path.join(memDir, 'memoc-usage.md'),    tplMemocUsage],
       [path.join(memDir, 'systems/README.md'),         tplSystemsReadme],
       [path.join(memDir, 'raw/README.md'),             tplRawReadme],
@@ -2042,10 +2287,18 @@ function run(dir, forceUpdate, action = 'update') {
       mark('add', 'llms.txt');
     }
 
-    // Dynamic memory files — update managed sections only
+    // Generated memory maps — replace so old protocols do not linger.
+    const generatedRefresh = [
+      [path.join(memDir, '00-project-brief.md'),       () => tplProjectBrief(p)],
+      [path.join(memDir, '00-agent-index.md'),         () => tplAgentIndex(p)],
+    ];
+    for (const [fp, tpl] of generatedRefresh) {
+      const rel = path.relative(dir, fp);
+      mark(writeChanged(fp, tpl()) ? 'update' : 'skip', rel);
+    }
+
+    // Dynamic user-owned memory files — update managed sections only
     const dynUpdates = [
-      [path.join(memDir, '00-project-brief.md'),       () => tplProjectBrief(p),   ID_S,   ID_E,   identityInner(p)],
-      [path.join(memDir, '00-agent-index.md'),         () => tplAgentIndex(p),     SNAP_S, SNAP_E, snapshotInner(p)],
       [path.join(memDir, '02-current-project-state.md'), () => tplCurrentState(p), SNAP_S, SNAP_E, snapshotInner(p)],
     ];
     for (const [fp, tpl, s, e, inner] of dynUpdates) {
@@ -2073,16 +2326,27 @@ function run(dir, forceUpdate, action = 'update') {
       mark('add', '.memoc/session-summary.md');
     }
 
-    // Static + user-owned files — only add if missing
-    const addIfMissing = [
+    // Protocol/template files — replace on update so old instructions are removed.
+    const templateRefresh = [
       [path.join(memDir, 'boot.md'),                   tplBoot],
       [path.join(memDir, '01-agent-workflow.md'),      tplWorkflow],
+      [path.join(memDir, '05-done-checklist.md'),      tplDoneChecklist],
+      [path.join(memDir, 'memoc-usage.md'),            tplMemocUsage],
+      [path.join(dir,    'skills/project-memory-maintainer/SKILL.md'), tplSkillMaintainer],
+    ];
+    for (const [fp, tpl] of templateRefresh) {
+      const rel = path.relative(dir, fp);
+      mark(writeChanged(fp, tpl()) ? 'update' : 'skip', rel);
+    }
+
+    // Static indexes/scaffolds — add if missing; content may be user- or command-owned.
+    const addIfMissing = [
       [path.join(memDir, '03-decisions.md'),           tplDecisions],
       [path.join(memDir, '04-handoff.md'),             tplHandoff],
-      [path.join(memDir, '05-done-checklist.md'),      tplDoneChecklist],
       [path.join(memDir, '06-project-rules.md'),       tplProjectRules],
-      [path.join(memDir, 'log.md'),                    tplLog],
-      [path.join(memDir, 'memoc-usage.md'),    tplMemocUsage],
+      [path.join(memDir, 'activity.md'),               tplActivity],
+      [path.join(memDir, 'actors/README.md'),          tplActorsReadme],
+      [path.join(memDir, 'worklog/README.md'),         tplWorklogReadme],
       [path.join(memDir, 'systems/README.md'),         tplSystemsReadme],
       [path.join(memDir, 'raw/README.md'),             tplRawReadme],
       [path.join(memDir, 'raw/files/README.md'),       tplRawFilesReadme],
@@ -2097,7 +2361,6 @@ function run(dir, forceUpdate, action = 'update') {
       [path.join(memDir, 'wiki/sources/README.md'),    tplWikiSourcesReadme],
       [path.join(memDir, 'wiki/topics/README.md'),     tplWikiTopicsReadme],
       [path.join(memDir, 'wiki/global/README.md'),     tplWikiGlobalReadme],
-      [path.join(dir,    'skills/project-memory-maintainer/SKILL.md'), tplSkillMaintainer],
     ];
     for (const [fp, tpl] of addIfMissing) {
       const rel = path.relative(dir, fp);
@@ -2106,8 +2369,20 @@ function run(dir, forceUpdate, action = 'update') {
     }
     ensureWikiScaffoldLinks(memDir, mark);
 
-    // Obsidian graph filters — add/merge memoc tags for existing installs too
-    ensureObsidianFrontmatter(dir, mark);
+    const legacyReferenceFiles = [
+      path.join(memDir, '02-current-project-state.md'),
+      path.join(memDir, '04-handoff.md'),
+      path.join(memDir, '06-project-rules.md'),
+      path.join(memDir, 'systems/README.md'),
+      path.join(memDir, 'wiki/index.md'),
+      path.join(memDir, 'wiki/sources.md'),
+      path.join(memDir, 'wiki/glossary.md'),
+      path.join(memDir, 'wiki/questions.md'),
+      path.join(memDir, 'wiki/lint.md'),
+    ];
+    for (const fp of legacyReferenceFiles) {
+      if (migrateLegacyLogReferences(fp)) mark('update', `${path.relative(dir, fp)} (legacy refs)`);
+    }
 
     // PATH helpers — let agents run memoc even when the npm bin is not on PATH
     ensureClaudeStopHookFile(dir, mark);
@@ -2115,15 +2390,10 @@ function run(dir, forceUpdate, action = 'update') {
     ensurePathHelpers(dir, mark);
     ensurePathRegistration(dir, mark);
 
-    // Append update record to log.md
-    const logPath = path.join(memDir, 'log.md');
-    if (fs.existsSync(logPath)) {
-      fs.appendFileSync(logPath,
-        `\n## [${nowISO()}] ${action} | Re-scanned: ${p.isEmpty ? 'nothing detected' : stackStr(p.stack)}\n`,
-        'utf8'
-      );
-      mark('append', '.memoc/log.md');
-    }
+    archiveLegacyLog(dir, mark);
+
+    // Obsidian graph filters — add/merge memoc tags for existing installs too
+    ensureObsidianFrontmatter(dir, mark);
   }
 
   hideOnWindows(memDir);
@@ -2162,6 +2432,262 @@ function runAdd(dir) {
   console.log('\n  Done.');
 }
 
+// ═══════════════════════════════════════════════════════════════════
+// ACTOR / WORKLOG — conflict-light shared repo activity tracking
+// ═══════════════════════════════════════════════════════════════════
+
+function runActor(dir) {
+  const sub = (process.argv[3] || '').toLowerCase();
+  if (sub === 'set') {
+    const name = process.argv.slice(4).join(' ').trim();
+    if (!name) {
+      console.error('\n  Usage: memoc actor set <name>');
+      process.exit(1);
+    }
+    const actor = sanitizeActor(name);
+    write(actorFile(dir), `${actor}\n`);
+    ensurePendingGitignore(dir, () => {});
+    console.log('\n  memoc actor\n');
+    console.log(`    Set local actor: ${actor}`);
+    console.log('    Stored in .memoc/local/actor (ignored by git).');
+    console.log();
+    return;
+  }
+
+  const detected = detectActor(dir);
+  console.log('\n  memoc actor\n');
+  console.log(`    Actor   ${detected.actor}`);
+  console.log(`    Source  ${detected.source}`);
+  console.log('\n  Use `memoc actor set <name>` to override locally.\n');
+}
+
+function runWork(dir) {
+  const rawArgs = process.argv.slice(3);
+  const opts = { status: 'done', body: '', fromGit: true };
+  const titleParts = [];
+  for (let i = 0; i < rawArgs.length; i++) {
+    const arg = rawArgs[i];
+    if (arg === '--status') {
+      opts.status = sanitizeActor(rawArgs[++i] || 'done');
+      continue;
+    }
+    if (arg.startsWith('--status=')) {
+      opts.status = sanitizeActor(arg.slice('--status='.length) || 'done');
+      continue;
+    }
+    if (arg === '--body') {
+      opts.body = rawArgs.slice(i + 1).join(' ');
+      break;
+    }
+    if (arg === '--from-git') {
+      opts.fromGit = true;
+      continue;
+    }
+    if (arg === '--no-git') {
+      opts.fromGit = false;
+      continue;
+    }
+    titleParts.push(arg);
+  }
+
+  const title = titleParts.join(' ').trim();
+  if (!title) {
+    console.error('\n  Usage: memoc work "<title>" [--status done|wip|blocked] [--from-git|--no-git] [--body "summary"]');
+    process.exit(1);
+  }
+
+  ensureMemocBase(dir);
+  const detected = detectActor(dir);
+  ensureActorProfile(dir, detected);
+  const stamp = new Date().toISOString().slice(0, 16).replace(/[-:]/g, '').replace('T', 'T');
+  const month = todayISO().slice(0, 7);
+  const fileName = `${stamp}-${slugify(title, 'work')}.md`;
+  const workPath = uniquePath(path.join(dir, '.memoc', 'worklog', detected.actor, month, fileName));
+  write(workPath, worklogRecord(dir, title, detected, opts));
+  ensureMemocFrontmatter(workPath, dir);
+
+  console.log('\n  memoc work\n');
+  console.log(`    Actor   ${detected.actor} (${detected.source})`);
+  console.log(`    Work    ${normRel(dir, workPath)}`);
+  console.log('    Next    Fill only Summary/Verification if needed; run `memoc activity --write` to regenerate indexes.');
+  console.log();
+}
+
+function runActivity(dir) {
+  const writeIndex = process.argv.slice(3).includes('--write');
+  const workRoot = path.join(dir, '.memoc', 'worklog');
+  const files = listMarkdownFiles(workRoot)
+    .filter(fp => path.basename(fp) !== 'README.md')
+    .sort()
+    .reverse();
+  const recent = files.slice(0, 20);
+
+  if (writeIndex) {
+    writeActivityIndexes(dir, recent);
+    ensureObsidianFrontmatter(dir, () => {});
+  }
+
+  console.log('\n  memoc activity\n');
+  if (!recent.length) {
+    console.log('    No worklog entries yet. Use `memoc work "<title>"`.');
+    console.log();
+    return;
+  }
+  for (const fp of recent) {
+    const src = safeRead(fp);
+    const title = markdownTitle(src, path.basename(fp, '.md'));
+    const actor = (src.match(/^actor:\s*(.+)$/m) || [])[1] || 'unknown';
+    const status = (src.match(/^status:\s*(.+)$/m) || [])[1] || 'unknown';
+    console.log(`    - ${normRel(dir, fp)}  ${actor}  ${status}  ${title}`);
+  }
+  if (writeIndex) console.log('\n    Wrote .memoc/activity.md and .memoc/worklog/README.md');
+  console.log();
+}
+
+function ensureActorProfile(dir, detected) {
+  const actorPath = path.join(dir, '.memoc', 'actors', `${detected.actor}.md`);
+  if (fs.existsSync(actorPath)) return;
+  write(actorPath, actorProfile(detected));
+  ensureMemocFrontmatter(actorPath, dir);
+}
+
+function actorProfile(detected) {
+  return `# ${detected.actor}
+
+## Identity
+
+- Actor: ${detected.actor}
+- First detected from: ${detected.source}
+- First seen: ${nowISO()}
+
+## Notes
+
+_Add stable collaboration preferences or ownership notes only when useful._
+
+## Related
+
+- [Actors](README.md)
+- [Activity](../activity.md)
+- [Worklog](../worklog/README.md)
+`;
+}
+
+function worklogRecord(dir, title, detected, opts) {
+  const branch = gitBranch(dir);
+  const changedFiles = opts.fromGit ? gitStatusFiles(dir) : [];
+  return `# ${title}
+
+actor: ${detected.actor}
+actor_source: ${detected.source}
+branch: ${branch}
+status: ${opts.status}
+created: ${nowISO()}
+
+## Summary
+
+${opts.body ? `- ${opts.body}` : '_1-3 bullets only. Keep this as a short receipt, not a report._'}
+
+## Changed Files
+
+${changedFiles.length ? changedFiles.map(file => `- \`${file}\``).join('\n') : '_None detected. Use `memoc work "<title>" --from-git` after editing files to prefill this section._'}
+
+## Verification
+
+_Commands run or checks not run. Keep to 1-3 bullets._
+
+## Follow-up
+
+_None._
+
+## Related
+
+- [Activity](../../../activity.md)
+- [Worklog](../../README.md)
+- [Actor](../../../actors/${detected.actor}.md)
+`;
+}
+
+function writeActivityIndexes(dir, recentFiles) {
+  const activityPath = path.join(dir, '.memoc', 'activity.md');
+  const worklogReadme = path.join(dir, '.memoc', 'worklog', 'README.md');
+  const actorsReadme = path.join(dir, '.memoc', 'actors', 'README.md');
+  const rows = recentFiles.map(fp => {
+    const src = safeRead(fp);
+    const title = markdownTitle(src, path.basename(fp, '.md'));
+    const actor = (src.match(/^actor:\s*(.+)$/m) || [])[1] || 'unknown';
+    const status = (src.match(/^status:\s*(.+)$/m) || [])[1] || 'unknown';
+    return { fp, title, actor, status };
+  });
+  const activityItems = rows.length
+    ? rows.map(row => `- [${row.title}](${pathRelativeMarkdown(path.join(dir, '.memoc'), row.fp).replace(/^\.\//, '')}) — ${row.actor} ${row.status}.`).join('\n')
+    : '_None yet._';
+  write(activityPath, `# Activity
+
+Generated shared activity index for memoc work logs.
+
+Last generated: ${nowISO()}
+
+## Recent Work
+
+${activityItems}
+
+## Related
+
+- [Actors](actors/README.md)
+- [Worklog](worklog/README.md)
+`);
+
+  const worklogItems = rows.length
+    ? rows.map(row => `- [${row.title}](${pathRelativeMarkdown(path.join(dir, '.memoc', 'worklog'), row.fp).replace(/^\.\//, '')}) — ${row.actor} ${row.status}.`).join('\n')
+    : '_None yet._';
+  write(worklogReadme, `# Worklog
+
+Generated index of conflict-light per-actor work records.
+
+Last generated: ${nowISO()}
+
+## Layout
+
+\`\`\`text
+worklog/<actor>/YYYY-MM/YYYYMMDDTHHMM-title.md
+\`\`\`
+
+## Rules
+
+- Prefer creating new worklog files over appending shared core memory files.
+- Keep worklog entries short: 1-3 summary bullets, key files, verification.
+
+## Recent Work
+
+${worklogItems}
+`);
+
+  const actorFiles = listMarkdownFiles(path.join(dir, '.memoc', 'actors'))
+    .filter(fp => path.basename(fp) !== 'README.md')
+    .sort();
+  const actorItems = actorFiles.length
+    ? actorFiles.map(fp => `- [${markdownTitle(safeRead(fp), path.basename(fp, '.md'))}](${path.basename(fp)})`).join('\n')
+    : '_None yet. Use `memoc actor set <name>` or `memoc work "<title>"`._';
+  write(actorsReadme, `# Actors
+
+Generated actor index for this shared repo.
+
+## Actor Detection
+
+1. \`MEMOC_ACTOR\`
+2. \`.memoc/local/actor\` set by \`memoc actor set <name>\`
+3. \`git config user.name\`
+4. \`git config user.email\`
+5. OS username
+
+\`.memoc/local/\` is ignored by git so each machine can keep its own actor setting.
+
+## Actors
+
+${actorItems}
+`);
+}
+
 // ═══════════════════════════════════════════════════════════════════
 // WIKI OPERATIONS — lint, ingest, and durable topic notes
 // ═══════════════════════════════════════════════════════════════════
@@ -2285,8 +2811,6 @@ function runIngest(dir) {
   addWikiListItem(path.join(dir, '.memoc', 'wiki', 'sources.md'), 'Source Records', pathRelativeMarkdown(path.join(dir, '.memoc', 'wiki'), sourcePath), title, 'needs synthesis');
   addWikiListItem(path.join(dir, '.memoc', 'wiki', 'sources', 'README.md'), 'Source Records', path.basename(sourcePath), title, 'source record');
   addWikiListItem(path.join(dir, '.memoc', 'wiki', 'index.md'), 'Pages', pathRelativeMarkdown(path.join(dir, '.memoc', 'wiki'), sourcePath), title, 'source record');
-  appendMemocLog(dir, `ingest | Added source record ${normRel(dir, sourcePath)} from ${isUrl ? target : normRel(dir, path.resolve(dir, target))}.`);
-
   console.log('\n  memoc ingest\n');
   console.log(`    Source record  ${normRel(dir, sourcePath)}`);
   console.log(`    Raw reference  ${rawDisplay}`);
@@ -2315,8 +2839,6 @@ function runNote(dir) {
   ensureMemocFrontmatter(topicPath, dir);
   addWikiListItem(path.join(dir, '.memoc', 'wiki', 'topics', 'README.md'), 'Topic Pages', path.basename(topicPath), title, 'topic note');
   addWikiListItem(path.join(dir, '.memoc', 'wiki', 'index.md'), 'Saved Queries', pathRelativeMarkdown(path.join(dir, '.memoc', 'wiki'), topicPath), title, 'saved query/topic note');
-  appendMemocLog(dir, `note | Saved wiki topic ${normRel(dir, topicPath)}.`);
-
   console.log('\n  memoc note\n');
   console.log(`    Topic  ${normRel(dir, topicPath)}`);
   console.log('    Next   Link related sources/topics, then run memoc lint-wiki.');
@@ -2334,7 +2856,9 @@ function ensureMemocBase(dir) {
     [path.join(memDir, 'raw/README.md'), tplRawReadme],
     [path.join(memDir, 'raw/files/README.md'), tplRawFilesReadme],
     [path.join(memDir, 'raw/urls/README.md'), tplRawUrlsReadme],
-    [path.join(memDir, 'log.md'), tplLog],
+    [path.join(memDir, 'activity.md'), tplActivity],
+    [path.join(memDir, 'actors/README.md'), tplActorsReadme],
+    [path.join(memDir, 'worklog/README.md'), tplWorklogReadme],
     [path.join(memDir, '00-agent-index.md'), () => tplAgentIndex(p)],
   ];
   for (const [fp, tpl] of files) ensure(fp, tpl());
@@ -2488,12 +3012,6 @@ function addWikiListItem(filePath, heading, link, title, note) {
   write(filePath, src.replace(re, `$1${replacementBody}`));
 }
 
-function appendMemocLog(dir, text) {
-  const fp = path.join(dir, '.memoc', 'log.md');
-  ensure(fp, tplLog());
-  fs.appendFileSync(fp, `\n## [${nowISO()}] ${text}\n`, 'utf8');
-}
-
 // ═══════════════════════════════════════════════════════════════════
 // SEARCH
 // ═══════════════════════════════════════════════════════════════════
@@ -2703,7 +3221,7 @@ function searchPriority(file, scope = 'memory') {
     '.memoc/04-handoff.md',
     '.memoc/06-project-rules.md',
     '.memoc/03-decisions.md',
-    '.memoc/log.md',
+    '.memoc/activity.md',
     'AGENTS.md',
     'CLAUDE.md',
     'llms.txt',
@@ -2737,7 +3255,7 @@ function runTokens(dir) {
     ['03-decisions.md',               path.join(memDir, '03-decisions.md')],
     ['04-handoff.md',                 path.join(memDir, '04-handoff.md')],
     ['06-project-rules.md',           path.join(memDir, '06-project-rules.md')],
-    ['log.md',                        path.join(memDir, 'log.md')],
+    ['activity.md',                   path.join(memDir, 'activity.md')],
   ];
 
   console.log('\n  memoc tokens\n');
@@ -2770,13 +3288,62 @@ function runTokens(dir) {
   const summaryContent = read(path.join(memDir, 'session-summary.md'));
   const summaryBytes   = Buffer.byteLength(summaryContent, 'utf8');
   if (summaryBytes > 800) {
-    console.log(`\n  ⚠ session-summary.md is ${summaryBytes}B — recommended <800B. Run \`memoc trim-summary\`, then move completed history to log.md and resume details to 04-handoff.md.`);
+    console.log(`\n  ⚠ session-summary.md is ${summaryBytes}B — recommended <800B. Run \`memoc trim-summary\`, then move completed history to worklog and resume details to 04-handoff.md.`);
+  }
+  console.log();
+}
+
+// ═══════════════════════════════════════════════════════════════════
+// DOCTOR — quick health checks for shared memoc repos
+// ═══════════════════════════════════════════════════════════════════
+
+function runDoctor(dir) {
+  const issues = [];
+  const warnings = [];
+  const memDir = path.join(dir, '.memoc');
+  const summaryPath = path.join(memDir, 'session-summary.md');
+  const summary = safeRead(summaryPath);
+  if (!summary) issues.push('Missing .memoc/session-summary.md');
+  else if (Buffer.byteLength(summary, 'utf8') > 800) warnings.push('session-summary.md exceeds 800B; run memoc trim-summary');
+
+  for (const fp of [
+    path.join(dir, '.memoc', 'bin', 'memoc'),
+    path.join(dir, '.memoc', 'bin', 'memoc.cmd'),
+    path.join(dir, '.memoc', 'bin', 'memoc.ps1'),
+  ]) {
+    const src = safeRead(fp);
+    if (src && (/C:\\Users\\|\/Users\/[^/]+\/\.local\/share\/memoc\/runtime/.test(src))) {
+      issues.push(`${normRel(dir, fp)} contains a user-specific runtime path; run memoc upgrade`);
+    }
+  }
+
+  for (const fp of collectMemocMarkdownFiles(dir)) {
+    const src = safeRead(fp);
+    const fenceCount = (src.match(/^---$/gm) || []).length;
+    if (fenceCount > 2) warnings.push(`${normRel(dir, fp)} may have nested frontmatter; run memoc upgrade`);
+  }
+
+  const actor = detectActor(dir);
+  if (actor.actor === 'unknown') warnings.push('Actor could not be detected; run memoc actor set <name>');
+
+  console.log('\n  memoc doctor\n');
+  console.log(`    Actor    ${actor.actor} (${actor.source})`);
+  console.log(`    Issues   ${issues.length}`);
+  console.log(`    Warnings ${warnings.length}`);
+  if (issues.length) {
+    console.log('\n  Issues:');
+    for (const issue of issues) console.log(`    - ${issue}`);
+  }
+  if (warnings.length) {
+    console.log('\n  Warnings:');
+    for (const warning of warnings.slice(0, 20)) console.log(`    - ${warning}`);
   }
+  if (!issues.length && !warnings.length) console.log('\n  Looks good.');
   console.log();
 }
 
 // ═══════════════════════════════════════════════════════════════════
-// COMPRESS — archive old log.md entries to keep file small
+// COMPRESS — legacy log.md archiver
 // ═══════════════════════════════════════════════════════════════════
 
 function runCompress(dir) {
@@ -2812,6 +3379,7 @@ function runCompress(dir) {
   write(logPath, header.trimEnd() + '\n' + toKeep.join('') + '\n');
 
   console.log(`\n  memoc compress\n`);
+  console.log('    Legacy command: new activity should use .memoc/worklog/ instead of log.md.');
   console.log(`    Archived  ${toArchive.length} entries → .memoc/log-archive.md`);
   console.log(`    Kept      ${toKeep.length} recent entries in log.md`);
   const saved = Buffer.byteLength(toArchive.join(''), 'utf8');
@@ -2851,12 +3419,11 @@ function runTrimSummary(dir) {
     : '# Session Summary Archive\n\nOlder oversized startup summaries moved by `memoc trim-summary`.\n';
   fs.appendFileSync(archivePath, `${archiveHeader}\n## [${nowISO()}] archived summary (${beforeBytes}B)\n\n${src.trimEnd()}\n`, 'utf8');
   write(summaryPath, compact);
-  appendMemocLog(dir, `trim-summary | Archived oversized session summary (${beforeBytes}B → ${afterBytes}B).`);
 
   console.log('\n  memoc trim-summary\n');
   console.log(`    Archived  .memoc/session-summary-archive.md`);
   console.log(`    Rewrote   .memoc/session-summary.md (${beforeBytes}B → ${afterBytes}B)`);
-  console.log('    Reminder  Completed history belongs in log.md; resume details belong in 04-handoff.md.');
+  console.log('    Reminder  Completed history belongs in worklog; resume details belong in 04-handoff.md.');
   console.log('\n  Done.\n');
 }
 
@@ -2866,7 +3433,7 @@ function compactSessionSummary(src) {
     '# Session Summary',
     `Last: ${nowISO()}`,
     'Replace this file instead of appending to it. Keep total size <800B and each section ≤3 bullets.',
-    'Completed history belongs in `log.md`; incomplete/risky resume detail belongs in `04-handoff.md`.',
+    'Completed history belongs in actor worklogs; incomplete/risky resume detail belongs in `04-handoff.md`.',
     '',
   ];
 
@@ -2980,8 +3547,12 @@ if (!cmd || cmd === '--help' || cmd === '-h' || cmd === 'help') {
   console.log('  summary            Print a tiny status/resume overview');
   console.log('  tokens             Estimate token cost of current memory files');
   console.log('  trim-summary       Archive and compact oversized session-summary.md');
-  console.log('  compress           Archive old log.md entries to keep file small');
+  console.log('  compress           Legacy: archive old log.md entries');
   console.log('  add <agent>        Add entry file for a specific agent (run without args to list)');
+  console.log('  actor [set <name>] Show or set the local memoc actor');
+  console.log('  work "<title>"     Create a conflict-light actor worklog entry');
+  console.log('  activity           List recent memoc worklog entries');
+  console.log('  doctor             Check common memoc health issues');
   console.log('  search "<query>"   Search memory/agent docs (use --snippets for line matches)');
   console.log('  grep "<query>"     Search project source/text files (use --snippets for line matches)');
   console.log('  ingest <path|url>  Create a raw/source record scaffold for wiki synthesis');
@@ -3005,6 +3576,10 @@ if (cmd === 'tokens')   { runTokens(cwd);     process.exit(0); }
 if (cmd === 'trim-summary') { runTrimSummary(cwd); process.exit(0); }
 if (cmd === 'compress') { runCompress(cwd);   process.exit(0); }
 if (cmd === 'add')      { runAdd(cwd);        process.exit(0); }
+if (cmd === 'actor')    { runActor(cwd);      process.exit(0); }
+if (cmd === 'work')     { runWork(cwd);       process.exit(0); }
+if (cmd === 'activity') { runActivity(cwd);   process.exit(0); }
+if (cmd === 'doctor')   { runDoctor(cwd);     process.exit(0); }
 if (cmd === 'search')   { runSearch(cwd, 'memory');  process.exit(0); }
 if (cmd === 'grep')     { runSearch(cwd, 'project'); process.exit(0); }
 if (cmd === 'ingest')   { runIngest(cwd);     process.exit(0); }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevin0181/memoc",
-  "version": "1.1.4",
+  "version": "1.1.11",
   "description": "Give AI agents a memory. Scaffolds session-to-session context for Claude Code, Codex, Cursor, and more.",
   "keywords": [
     "ai",