@karmaniverous/jeeves 0.3.0 → 0.3.1

package/content/agents-section.md

@@ -177,11 +177,17 @@ No stranded local branches. Push immediately after commit. A commit that isn't p
 
 ### Check PR State Before Pushing
 
-**Before EVERY `git push`**, verify the PR is not already merged. Pushing to a merged branch creates orphaned work that is invisible in the main branch and wastes effort.
+**Before EVERY `git push`**, run `gh pr list --head <branch> --repo <repo> --json number,state` to check whether a PR exists on that branch and whether it's merged.
 
-Sequence: `gh pr view --json state` → confirm state is `OPEN` → push. If no PR exists yet, pushing is safe. If the PR is `MERGED` or `CLOSED`, **STOP** and report to the user.
+- **No PR exists:** Safe to push.
+- **PR is `OPEN`:** Safe to push.
+- **PR is `MERGED` or `CLOSED`:** **STOP** and report to the user. Do not push to a merged PR branch.
 
-This is not optional. It applies to every push, every branch, every time.
+This is not optional. It applies to every push, every branch, every time. No judgment call about whether the branch "is a PR branch" — the check is mechanical.
+
+### New PR Over Merged Branch
+
+When a PR has been merged and additional work is needed on the same branch, create a new PR on the **same branch** targeting the same base. Do not create new branches, cherry-pick, or start over. The commits are already there — `gh pr create --head <existing-branch>` is the entire operation.
 
 ## Managed Content Self-Maintenance
 

package/content/soul-section.md

@@ -21,6 +21,7 @@
 I am a **senior software engineer** first. The persona is style; the engineering discipline is substance.
 
 What this means in practice:
+- **Do not execute untested code.** Every mutation script defaults to dry-run mode. The dry-run output is the test — it shows what would happen. Live execution requires an explicit flag. If dry-run is hard to implement, that's a design flaw.
 - **No cowboy coding.** I don't iterate in production. I don't ship untested changes. I don't treat live systems as scratch pads.
 - **I follow proper workflows.** Branch, test, review, merge. CI/CD exists for a reason. If there's a pipeline, I use it.
 - **I resist n00b temptations.** "Let me just quickly…" in prod is how outages happen. I know better.

package/dist/cli/jeeves/index.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-#!/usr/bin/env node
 import require$$0 from 'commander';
 import { existsSync, readFileSync, writeFileSync, renameSync, mkdirSync, cpSync, rmSync } from 'node:fs';
 import { join, dirname } from 'node:path';
@@ -104,6 +103,12 @@ const AGENTS_MARKERS = {
     /** H1 title prepended in the managed block. */
     title: 'Jeeves Platform Agents',
 };
+/** All known marker sets — single source of truth for cross-contamination detection. */
+const ALL_MARKERS = [
+    TOOLS_MARKERS,
+    SOUL_MARKERS,
+    AGENTS_MARKERS,
+];
 /**
  * Regex pattern to extract version stamp from a BEGIN marker comment.
  *
@@ -200,14 +205,14 @@ const SECTION_ORDER = [
  * Core library version, inlined at build time.
  *
  * @remarks
- * The `0.2.0` placeholder is replaced by
+ * The `0.3.0` placeholder is replaced by
  * `@rollup/plugin-replace` during the build with the actual version
  * from `package.json`. This ensures the correct version survives
  * when consumers bundle core into their own dist (where runtime
  * `import.meta.url`-based resolution would find the wrong package.json).
  */
 /** The core library version from package.json (inlined at build time). */
-const CORE_VERSION = '0.2.0';
+const CORE_VERSION = '0.3.0';
 
 /**
  * Core configuration schema and resolution.
@@ -541,11 +546,17 @@ No stranded local branches. Push immediately after commit. A commit that isn't p
 
 ### Check PR State Before Pushing
 
-**Before EVERY \`git push\`**, verify the PR is not already merged. Pushing to a merged branch creates orphaned work that is invisible in the main branch and wastes effort.
+**Before EVERY \`git push\`**, run \`gh pr list --head <branch> --repo <repo> --json number,state\` to check whether a PR exists on that branch and whether it's merged.
+
+- **No PR exists:** Safe to push.
+- **PR is \`OPEN\`:** Safe to push.
+- **PR is \`MERGED\` or \`CLOSED\`:** **STOP** and report to the user. Do not push to a merged PR branch.
 
-Sequence: \`gh pr view --json state\` → confirm state is \`OPEN\` → push. If no PR exists yet, pushing is safe. If the PR is \`MERGED\` or \`CLOSED\`, **STOP** and report to the user.
+This is not optional. It applies to every push, every branch, every time. No judgment call about whether the branch "is a PR branch" — the check is mechanical.
 
-This is not optional. It applies to every push, every branch, every time.
+### New PR Over Merged Branch
+
+When a PR has been merged and additional work is needed on the same branch, create a new PR on the **same branch** targeting the same base. Do not create new branches, cherry-pick, or start over. The commits are already there — \`gh pr create --head <existing-branch>\` is the entire operation.
 
 ## Managed Content Self-Maintenance
 
@@ -581,6 +592,7 @@ var soulSectionContent = `## Core Truths
 I am a **senior software engineer** first. The persona is style; the engineering discipline is substance.
 
 What this means in practice:
+- **Do not execute untested code.** Every mutation script defaults to dry-run mode. The dry-run output is the test — it shows what would happen. Live execution requires an explicit flag. If dry-run is hard to implement, that's a design flaw.
 - **No cowboy coding.** I don't iterate in production. I don't ship untested changes. I don't treat live systems as scratch pads.
 - **I follow proper workflows.** Branch, test, review, merge. CI/CD exists for a reason. If there's a pipeline, I use it.
 - **I resist n00b temptations.** "Let me just quickly…" in prod is how outages happen. I know better.
@@ -1024,6 +1036,48 @@ function parseManaged(fileContent, markers = TOOLS_MARKERS) {
     };
 }
 
+/**
+ * Strip foreign managed blocks from content.
+ *
+ * @remarks
+ * Prevents cross-contamination by removing managed blocks that belong
+ * to other marker sets. For example, when writing TOOLS.md with TOOLS
+ * markers, any SOUL or AGENTS managed blocks found in the user content
+ * zone are stripped — they don't belong there.
+ *
+ * @packageDocumentation
+ */
+/**
+ * Build a regex that matches an entire managed block (BEGIN marker through END marker).
+ *
+ * @param markers - The marker set to match.
+ * @returns A regex that matches the full block including markers.
+ */
+function buildBlockPattern(markers) {
+    const escapedBegin = markers.begin.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const escapedEnd = markers.end.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    return new RegExp(`\\s*<!--\\s*${escapedBegin}(?:\\s*\\|[^>]*)?\\s*(?:—[^>]*)?\\s*-->[\\s\\S]*?<!--\\s*${escapedEnd}\\s*-->\\s*`, 'g');
+}
+/**
+ * Strip managed blocks belonging to foreign marker sets from content.
+ *
+ * @param content - The content to clean (typically user content zone).
+ * @param currentMarkers - The marker set that owns this file (will NOT be stripped).
+ * @returns Content with foreign managed blocks removed.
+ */
+function stripForeignMarkers(content, currentMarkers) {
+    let result = content;
+    for (const markers of ALL_MARKERS) {
+        // Skip the current file's own markers
+        if (markers.begin === currentMarkers.begin)
+            continue;
+        const pattern = buildBlockPattern(markers);
+        result = result.replace(pattern, '\n');
+    }
+    // Clean up multiple blank lines left by removals
+    return result.replace(/\n{3,}/g, '\n\n').trim();
+}
+
 /**
  * Version-stamp parsing and convergence logic.
  *
@@ -1140,8 +1194,8 @@ async function updateManagedSection(filePath, content, options = {}) {
                     ? `# ${markers.title}\n\n${sectionText}`
                     : sectionText;
             }
-            // Cleanup detection
-            const userContent = parsed.userContent;
+            // Strip foreign managed blocks from user content (cross-contamination fix)
+            const userContent = stripForeignMarkers(parsed.userContent, markers);
             const cleanupNeeded = needsCleanup(newManagedBody, userContent);
             // Build the full managed block
             const beginLine = formatBeginMarker(markers.begin, coreVersion);

package/dist/index.d.ts

@@ -910,7 +910,9 @@ declare function patchConfig(config: Record<string, unknown>, pluginId: string,
 interface ToolResult {
     /** Content blocks — typically a single text block. */
     content: Array<{
+        /** MIME type identifier (e.g. `"text"`). */
         type: string;
+        /** Text content of the block. */
         text: string;
     }>;
     /** Whether this result represents an error. */
@@ -955,6 +957,7 @@ interface PluginApi {
         plugins?: {
             /** Plugin entries keyed by plugin ID. */
             entries?: Record<string, {
+                /** Plugin-specific configuration key-value pairs. */
                 config?: Record<string, unknown>;
             }>;
         };

package/dist/index.js

@@ -80,14 +80,14 @@ const COMPONENT_VERSIONS_FILE = 'component-versions.json';
  * Core library version, inlined at build time.
  *
  * @remarks
- * The `0.2.0` placeholder is replaced by
+ * The `0.3.0` placeholder is replaced by
  * `@rollup/plugin-replace` during the build with the actual version
  * from `package.json`. This ensures the correct version survives
  * when consumers bundle core into their own dist (where runtime
  * `import.meta.url`-based resolution would find the wrong package.json).
  */
 /** The core library version from package.json (inlined at build time). */
-const CORE_VERSION = '0.2.0';
+const CORE_VERSION = '0.3.0';
 
 /**
  * Shared file I/O helpers for managed section operations.
@@ -235,6 +235,12 @@ const AGENTS_MARKERS = {
     /** H1 title prepended in the managed block. */
     title: 'Jeeves Platform Agents',
 };
+/** All known marker sets — single source of truth for cross-contamination detection. */
+const ALL_MARKERS = [
+    TOOLS_MARKERS,
+    SOUL_MARKERS,
+    AGENTS_MARKERS,
+];
 /**
  * Regex pattern to extract version stamp from a BEGIN marker comment.
  *
@@ -583,6 +589,48 @@ function parseManaged(fileContent, markers = TOOLS_MARKERS) {
     };
 }
 
+/**
+ * Strip foreign managed blocks from content.
+ *
+ * @remarks
+ * Prevents cross-contamination by removing managed blocks that belong
+ * to other marker sets. For example, when writing TOOLS.md with TOOLS
+ * markers, any SOUL or AGENTS managed blocks found in the user content
+ * zone are stripped — they don't belong there.
+ *
+ * @packageDocumentation
+ */
+/**
+ * Build a regex that matches an entire managed block (BEGIN marker through END marker).
+ *
+ * @param markers - The marker set to match.
+ * @returns A regex that matches the full block including markers.
+ */
+function buildBlockPattern(markers) {
+    const escapedBegin = markers.begin.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const escapedEnd = markers.end.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    return new RegExp(`\\s*<!--\\s*${escapedBegin}(?:\\s*\\|[^>]*)?\\s*(?:—[^>]*)?\\s*-->[\\s\\S]*?<!--\\s*${escapedEnd}\\s*-->\\s*`, 'g');
+}
+/**
+ * Strip managed blocks belonging to foreign marker sets from content.
+ *
+ * @param content - The content to clean (typically user content zone).
+ * @param currentMarkers - The marker set that owns this file (will NOT be stripped).
+ * @returns Content with foreign managed blocks removed.
+ */
+function stripForeignMarkers(content, currentMarkers) {
+    let result = content;
+    for (const markers of ALL_MARKERS) {
+        // Skip the current file's own markers
+        if (markers.begin === currentMarkers.begin)
+            continue;
+        const pattern = buildBlockPattern(markers);
+        result = result.replace(pattern, '\n');
+    }
+    // Clean up multiple blank lines left by removals
+    return result.replace(/\n{3,}/g, '\n\n').trim();
+}
+
 /**
  * Version-stamp parsing and convergence logic.
  *
@@ -699,8 +747,8 @@ async function updateManagedSection(filePath, content, options = {}) {
                     ? `# ${markers.title}\n\n${sectionText}`
                     : sectionText;
             }
-            // Cleanup detection
-            const userContent = parsed.userContent;
+            // Strip foreign managed blocks from user content (cross-contamination fix)
+            const userContent = stripForeignMarkers(parsed.userContent, markers);
             const cleanupNeeded = needsCleanup(newManagedBody, userContent);
             // Build the full managed block
             const beginLine = formatBeginMarker(markers.begin, coreVersion);
@@ -914,11 +962,17 @@ No stranded local branches. Push immediately after commit. A commit that isn't p
 
 ### Check PR State Before Pushing
 
-**Before EVERY \`git push\`**, verify the PR is not already merged. Pushing to a merged branch creates orphaned work that is invisible in the main branch and wastes effort.
+**Before EVERY \`git push\`**, run \`gh pr list --head <branch> --repo <repo> --json number,state\` to check whether a PR exists on that branch and whether it's merged.
+
+- **No PR exists:** Safe to push.
+- **PR is \`OPEN\`:** Safe to push.
+- **PR is \`MERGED\` or \`CLOSED\`:** **STOP** and report to the user. Do not push to a merged PR branch.
+
+This is not optional. It applies to every push, every branch, every time. No judgment call about whether the branch "is a PR branch" — the check is mechanical.
 
-Sequence: \`gh pr view --json state\` → confirm state is \`OPEN\` → push. If no PR exists yet, pushing is safe. If the PR is \`MERGED\` or \`CLOSED\`, **STOP** and report to the user.
+### New PR Over Merged Branch
 
-This is not optional. It applies to every push, every branch, every time.
+When a PR has been merged and additional work is needed on the same branch, create a new PR on the **same branch** targeting the same base. Do not create new branches, cherry-pick, or start over. The commits are already there — \`gh pr create --head <existing-branch>\` is the entire operation.
 
 ## Managed Content Self-Maintenance
 
@@ -954,6 +1008,7 @@ var soulSectionContent = `## Core Truths
 I am a **senior software engineer** first. The persona is style; the engineering discipline is substance.
 
 What this means in practice:
+- **Do not execute untested code.** Every mutation script defaults to dry-run mode. The dry-run output is the test — it shows what would happen. Live execution requires an explicit flag. If dry-run is hard to implement, that's a design flaw.
 - **No cowboy coding.** I don't iterate in production. I don't ship untested changes. I don't treat live systems as scratch pads.
 - **I follow proper workflows.** Branch, test, review, merge. CI/CD exists for a reason. If there's a pipeline, I use it.
 - **I resist n00b temptations.** "Let me just quickly…" in prod is how outages happen. I know better.

package/package.json

@@ -139,5 +139,5 @@
   },
   "type": "module",
   "types": "dist/index.d.ts",
-  "version": "0.3.0"
+  "version": "0.3.1"
 }