snipara-companion 3.2.4 → 3.2.5

package/dist/index.js

@@ -12461,7 +12461,7 @@ function printDoctorReport(report, companionVersion, auth, toolCatalog) {
     "- This doctor confirms local auth and hosted reachability; it does not prove how a specific agent UI ranked or exposed tools."
   );
   console.log(
-    "- If an agent session shows only a subset of Snipara tools, call snipara_help(list_all=true) in that session before concluding a tool is unavailable."
+    "- A lean Snipara tool set is expected in normal agent sessions. Use snipara_help(query=...) for routed guidance and snipara_help(list_all=true) to inspect specialist opt-in surfaces."
   );
   if (toolCatalog.available && toolCatalog.htaskToolCount) {
     console.log(
@@ -29794,6 +29794,11 @@ var HOSTED_GUARD_MAX_FILES = 450;
 var HOSTED_GUARD_MAX_RESOURCES = 850;
 var HOSTED_GUARD_MAX_SYMBOL_RESOURCES = 160;
 var HOOK_BLOCK_PREFIX2 = "snipara:collaboration-guard";
+var CHECKOUT_GIT_WRITE_RESOURCE = {
+  kind: "SURFACE",
+  id: "checkout-git-write",
+  label: "Checkout git write access"
+};
 var CRITICAL_SURFACES = [
   {
     id: "auth",
@@ -30647,6 +30652,9 @@ function resolveRepoRoot3(cwd) {
 }
 function deriveGuardProfileResources(profile, files) {
   const resources = [];
+  if (profile === "pre-commit" || profile === "pre-push") {
+    resources.push(CHECKOUT_GIT_WRITE_RESOURCE);
+  }
   if (profile === "pre-deploy") {
     resources.push(
       { kind: "DEPLOY", id: "production-deployment", label: "Production deployment" },
@@ -30861,11 +30869,12 @@ function buildCollaborationGitHookBlock(hookName) {
   const profile = hookName === "pre-push" ? "pre-push" : "pre-commit";
   return [
     collaborationHookBlockMarker(hookName, "start"),
-    "# Block unsafe parallel edits before code leaves the local worktree.",
+    "# Atomically claim checkout git writes, then block unsafe parallel edits.",
     'if [ "${SNIPARA_COLLABORATION_GUARD:-1}" = "0" ]; then',
     '  echo "Snipara collaboration guard bypassed by SNIPARA_COLLABORATION_GUARD=0" >&2',
     "elif command -v snipara-companion >/dev/null 2>&1; then",
-    `  snipara-companion collaboration guard --profile ${profile} --action ${profile} --enforce --json >/dev/null`,
+    `  snipara-companion collaboration claim --resource SURFACE:checkout-git-write --mode EXCLUSIVE --ttl-seconds 300 --reason "${profile} git write" --json >/dev/null`,
+    `  snipara-companion collaboration guard --profile ${profile} --action ${profile} --resource SURFACE:checkout-git-write --enforce --json >/dev/null`,
     "else",
     '  echo "snipara-companion is required for the Snipara collaboration guard. Install it or set SNIPARA_COLLABORATION_GUARD=0 for an explicit emergency bypass." >&2',
     "  exit 1",

package/docs/FULL_REFERENCE.md

@@ -137,11 +137,11 @@ For Codex, the primary integration remains Hosted MCP plus `AGENTS.md`.
 - `snipara-companion` is still skippable with `--profile hosted-only` or `--skip-companion`.
 - Use it when compaction-safe phase commits, Project Intelligence briefs, local doctor checks, or shared helper workflows are useful.
 - Use `workflow scaffold --preset project-intelligence-continuity-layer` for roadmap-sized Project Intelligence work that needs phase commits.
-- If an agent session exposes only a subset of Snipara tools, use `snipara_help(list_all=true)` in that session before concluding a tool is unavailable.
+- Normal agent sessions intentionally expose a small Snipara tool set. Use `snipara_help(query=...)` for routed guidance and `snipara_help(list_all=true)` to inspect specialist tools before requesting an expanded surface.
 
 ## Configuring MCP Tool Surfaces
 
-The MCP server advertises different tool surfaces depending on the `SNIPARA_EXPOSED_SURFACES` environment variable. Hosted MCP defaults to inline tools plus a small companion maintenance set for index health, reindexing, and read-only memory hygiene. To expose all companion tools directly in the advertised manifest, set `SNIPARA_EXPOSED_SURFACES=inline,companion` on the MCP server. To expose swarm and htask coordination tools, use `SNIPARA_EXPOSED_SURFACES=inline,orchestrator`. Remaining non-default tools are discoverable via `snipara_help` and can be executed by direct JSON-RPC or clients/server configurations that expose those surfaces. Standard MCP agents only receive schemas for tools returned by `tools/list`.
+The MCP server advertises different tool surfaces depending on the `SNIPARA_EXPOSED_SURFACES` environment variable. Hosted MCP defaults to the lean agent contract: context, search, read, stats, help, memory recall/capture, and end-of-task commit. Specialist inline, companion, and orchestrator tools stay discoverable via `snipara_help`, which now marks them as `routed_or_opt_in`; standard agents should usually stay on the simple verbs and let Snipara route internally. To expose companion tools directly in the advertised manifest, set `SNIPARA_EXPOSED_SURFACES=inline,companion` on the MCP server. To expose swarm and htask coordination tools, use `SNIPARA_EXPOSED_SURFACES=inline,orchestrator`. Standard MCP agents only receive schemas for tools returned by `tools/list`.
 
 ## Installation
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "snipara-companion",
-  "version": "3.2.4",
+  "version": "3.2.5",
   "description": "Local-first CLI that asks your repo what breaks before an AI coding agent edits it.",
   "main": "dist/index.js",
   "bin": {