auto: save WIP progress from rcc session

The Rust CLI previously hid init behind the REPL slash-command surface and only
created a starter CLAUDE.md. This change adds a direct `init` subcommand and
moves bootstrap behavior into a shared helper so `/init` and `init` create the
same project scaffolding: `.claude/`, `.claude.json`, starter `CLAUDE.md`, and
local-only `.gitignore` entries. The generated guidance now adapts to a small,
explicit set of repository markers so new projects get language/framework-aware
starting instructions without overwriting existing files.

Constraint: Runtime config precedence already treats `.claude.json`, `.claude/settings.json`, and `.claude/settings.local.json` as separate scopes
Constraint: `.claude/sessions/` is used for local session persistence and should not be committed by default
Rejected: Keep init as REPL-only `/init` behavior | would not satisfy the requested direct init command and keeps bootstrap discoverability low
Rejected: Ignore all of `.claude/` | would hide shared project config that the runtime can intentionally load
Confidence: high
Scope-risk: moderate
Reversibility: clean
Directive: Keep direct `init` and `/init` on the same helper path and keep detection heuristics bounded to explicit repository markers
Tested: cargo fmt --all; cargo clippy --workspace --all-targets -- -D warnings; cargo test --workspace
Not-tested: interactive manual run of `rusty-claude-cli init` against a non-test repository

rust/.omc/project-memory.json

@@ -0,0 +1,127 @@
+{
+  "version": "1.0.0",
+  "lastScanned": 1774971516826,
+  "projectRoot": "/home/bellman/Workspace/clawd-code-worktrees/api/rust",
+  "techStack": {
+    "languages": [
+      {
+        "name": "Rust",
+        "version": null,
+        "confidence": "high",
+        "markers": [
+          "Cargo.toml"
+        ]
+      }
+    ],
+    "frameworks": [],
+    "packageManager": "cargo",
+    "runtime": null
+  },
+  "build": {
+    "buildCommand": "cargo build",
+    "testCommand": "cargo test",
+    "lintCommand": "cargo clippy",
+    "devCommand": "cargo run",
+    "scripts": {}
+  },
+  "conventions": {
+    "namingStyle": null,
+    "importStyle": null,
+    "testPattern": null,
+    "fileOrganization": null
+  },
+  "structure": {
+    "isMonorepo": false,
+    "workspaces": [],
+    "mainDirectories": [],
+    "gitBranches": {
+      "defaultBranch": "main",
+      "branchingStrategy": null
+    }
+  },
+  "customNotes": [],
+  "directoryMap": {
+    "crates": {
+      "path": "crates",
+      "purpose": null,
+      "fileCount": 0,
+      "lastAccessed": 1774971516823,
+      "keyFiles": []
+    },
+    "target": {
+      "path": "target",
+      "purpose": null,
+      "fileCount": 2,
+      "lastAccessed": 1774971516823,
+      "keyFiles": [
+        "CACHEDIR.TAG"
+      ]
+    },
+    "crates/api": {
+      "path": "crates/api",
+      "purpose": "API routes",
+      "fileCount": 1,
+      "lastAccessed": 1774971516824,
+      "keyFiles": [
+        "Cargo.toml"
+      ]
+    }
+  },
+  "hotPaths": [
+    {
+      "path": "crates/api/Cargo.toml",
+      "accessCount": 1,
+      "lastAccessed": 1774971547109,
+      "type": "file"
+    },
+    {
+      "path": "crates/api/src/lib.rs",
+      "accessCount": 1,
+      "lastAccessed": 1774971547624,
+      "type": "file"
+    },
+    {
+      "path": "crates/api/src/client.rs",
+      "accessCount": 1,
+      "lastAccessed": 1774971548001,
+      "type": "file"
+    },
+    {
+      "path": "crates/api/src/error.rs",
+      "accessCount": 1,
+      "lastAccessed": 1774971548503,
+      "type": "file"
+    },
+    {
+      "path": "crates/api/src/sse.rs",
+      "accessCount": 1,
+      "lastAccessed": 1774971549311,
+      "type": "file"
+    },
+    {
+      "path": "crates/api/src/types.rs",
+      "accessCount": 1,
+      "lastAccessed": 1774971549472,
+      "type": "file"
+    },
+    {
+      "path": "crates/api/tests/client_integration.rs",
+      "accessCount": 1,
+      "lastAccessed": 1774971550143,
+      "type": "file"
+    },
+    {
+      "path": "Cargo.toml",
+      "accessCount": 1,
+      "lastAccessed": 1774971550539,
+      "type": "file"
+    },
+    {
+      "path": "crates/rusty-claude-cli/src/main.rs",
+      "accessCount": 1,
+      "lastAccessed": 1774971551474,
+      "type": "file"
+    }
+  ],
+  "userDirectives": []
+}

rust/.omc/state/idle-notif-cooldown.json

@@ -0,0 +1,3 @@
+{
+  "lastSentAt": "2026-03-31T15:39:44.771Z"
+}

rust/README.md

@@ -109,6 +109,13 @@ cd rust
 cargo run -p rusty-claude-cli -- --allowedTools read,glob
 ```
 
+Bootstrap Claude project files for the current repo:
+
+```bash
+cd rust
+cargo run -p rusty-claude-cli -- init
+```
+
 ### 2) REPL mode
 
 Start the interactive shell:
@@ -133,7 +140,6 @@ Inside the REPL, useful commands include:
 /diff
 /version
 /export notes.txt
-/sessions
 /session list
 /exit
 ```
@@ -144,14 +150,14 @@ Inspect or maintain a saved session file without entering the REPL:
 
 ```bash
 cd rust
-cargo run -p rusty-claude-cli -- --resume session-123456 /status /compact /cost
+cargo run -p rusty-claude-cli -- --resume session.json /status /compact /cost
 ```
 
 You can also inspect memory/config state for a restored session:
 
 ```bash
 cd rust
-cargo run -p rusty-claude-cli -- --resume ~/.claude/sessions/session-123456.json /memory /config
+cargo run -p rusty-claude-cli -- --resume session.json /memory /config
 ```
 
 ## Available commands
@@ -159,7 +165,7 @@ cargo run -p rusty-claude-cli -- --resume ~/.claude/sessions/session-123456.json
 ### Top-level CLI commands
 
 - `prompt <text...>` — run one prompt non-interactively
-- `--resume <session-id-or-path> [/commands...]` — inspect or maintain a saved session stored under `~/.claude/sessions/`
+- `--resume <session.json> [/commands...]` — inspect or maintain a saved session
 - `dump-manifests` — print extracted upstream manifest counts
 - `bootstrap-plan` — print the current bootstrap skeleton
 - `system-prompt [--cwd PATH] [--date YYYY-MM-DD]` — render the synthesized system prompt
@@ -177,14 +183,13 @@ cargo run -p rusty-claude-cli -- --resume ~/.claude/sessions/session-123456.json
 - `/permissions [read-only|workspace-write|danger-full-access]` — inspect or switch permissions
 - `/clear [--confirm]` — clear the current local session
 - `/cost` — show token usage totals
-- `/resume <session-id-or-path>` — load a saved session into the REPL
+- `/resume <session-path>` — load a saved session into the REPL
 - `/config [env|hooks|model]` — inspect discovered Claude config
 - `/memory` — inspect loaded instruction memory files
-- `/init` — create a starter `CLAUDE.md`
+- `/init` — bootstrap `.claude.json`, `.claude/`, `CLAUDE.md`, and local ignore rules
 - `/diff` — show the current git diff for the workspace
 - `/version` — print version and build metadata locally
 - `/export [file]` — export the current conversation transcript
-- `/sessions` — list recent managed local sessions from `~/.claude/sessions/`
 - `/session [list|switch <session-id>]` — inspect or switch managed local sessions
 - `/exit` — leave the REPL
 

rust/crates/commands/src/lib.rs

@@ -84,7 +84,7 @@ const SLASH_COMMAND_SPECS: &[SlashCommandSpec] = &[
     SlashCommandSpec {
         name: "resume",
         summary: "Load a saved session into the REPL",
-        argument_hint: Some("<session-id-or-path>"),
+        argument_hint: Some("<session-path>"),
         resume_supported: false,
     },
     SlashCommandSpec {
@@ -101,7 +101,7 @@ const SLASH_COMMAND_SPECS: &[SlashCommandSpec] = &[
     },
     SlashCommandSpec {
         name: "init",
-        summary: "Create a starter CLAUDE.md for this repo",
+        summary: "Bootstrap Claude project files for this repo",
         argument_hint: None,
         resume_supported: true,
     },
@@ -129,12 +129,6 @@ const SLASH_COMMAND_SPECS: &[SlashCommandSpec] = &[
         argument_hint: Some("[list|switch <session-id>]"),
         resume_supported: false,
     },
-    SlashCommandSpec {
-        name: "sessions",
-        summary: "List recent managed local sessions",
-        argument_hint: None,
-        resume_supported: false,
-    },
 ];
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -169,7 +163,6 @@ pub enum SlashCommand {
         action: Option<String>,
         target: Option<String>,
     },
-    Sessions,
     Unknown(String),
 }
 
@@ -214,7 +207,6 @@ impl SlashCommand {
                 action: parts.next().map(ToOwned::to_owned),
                 target: parts.next().map(ToOwned::to_owned),
             },
-            "sessions" => Self::Sessions,
             other => Self::Unknown(other.to_string()),
         })
     }
@@ -299,7 +291,6 @@ pub fn handle_slash_command(
         | SlashCommand::Version
         | SlashCommand::Export { .. }
         | SlashCommand::Session { .. }
-        | SlashCommand::Sessions
         | SlashCommand::Unknown(_) => None,
     }
 }
@@ -374,10 +365,6 @@ mod tests {
                 target: Some("abc123".to_string())
             })
         );
-        assert_eq!(
-            SlashCommand::parse("/sessions"),
-            Some(SlashCommand::Sessions)
-        );
     }
 
     #[test]
@@ -391,7 +378,7 @@ mod tests {
         assert!(help.contains("/permissions [read-only|workspace-write|danger-full-access]"));
         assert!(help.contains("/clear [--confirm]"));
         assert!(help.contains("/cost"));
-        assert!(help.contains("/resume <session-id-or-path>"));
+        assert!(help.contains("/resume <session-path>"));
         assert!(help.contains("/config [env|hooks|model]"));
         assert!(help.contains("/memory"));
         assert!(help.contains("/init"));
@@ -399,8 +386,7 @@ mod tests {
         assert!(help.contains("/version"));
         assert!(help.contains("/export [file]"));
         assert!(help.contains("/session [list|switch <session-id>]"));
-        assert!(help.contains("/sessions"));
+        assert_eq!(slash_command_specs().len(), 15);
-        assert_eq!(slash_command_specs().len(), 16);
         assert_eq!(resume_supported_slash_commands().len(), 11);
     }
 
@@ -418,7 +404,6 @@ mod tests {
                     text: "recent".to_string(),
                 }]),
             ],
-            metadata: None,
         };
 
         let result = handle_slash_command(
@@ -483,6 +468,5 @@ mod tests {
         assert!(
             handle_slash_command("/session list", &session, CompactionConfig::default()).is_none()
         );
-        assert!(handle_slash_command("/sessions", &session, CompactionConfig::default()).is_none());
     }
 }

rust/crates/runtime/src/compact.rs

@@ -105,7 +105,6 @@ pub fn compact_session(session: &Session, config: CompactionConfig) -> Compactio
         compacted_session: Session {
             version: session.version,
             messages: compacted_messages,
-            metadata: session.metadata.clone(),
         },
         removed_message_count: removed.len(),
     }
@@ -394,7 +393,6 @@ mod tests {
         let session = Session {
             version: 1,
             messages: vec![ConversationMessage::user_text("hello")],
-            metadata: None,
         };
 
         let result = compact_session(&session, CompactionConfig::default());
@@ -422,7 +420,6 @@ mod tests {
                     usage: None,
                 },
             ],
-            metadata: None,
         };
 
         let result = compact_session(

rust/crates/runtime/src/lib.rs

@@ -73,9 +73,7 @@ pub use remote::{
     RemoteSessionContext, UpstreamProxyBootstrap, UpstreamProxyState, DEFAULT_REMOTE_BASE_URL,
     DEFAULT_SESSION_TOKEN_PATH, DEFAULT_SYSTEM_CA_BUNDLE, NO_PROXY_HOSTS, UPSTREAM_PROXY_ENV_KEYS,
 };
-pub use session::{
+pub use session::{ContentBlock, ConversationMessage, MessageRole, Session, SessionError};
-    ContentBlock, ConversationMessage, MessageRole, Session, SessionError, SessionMetadata,
-};
 pub use usage::{
     format_usd, pricing_for_model, ModelPricing, TokenUsage, UsageCostEstimate, UsageTracker,
 };

rust/crates/runtime/src/session.rs

@@ -39,19 +39,10 @@ pub struct ConversationMessage {
     pub usage: Option<TokenUsage>,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct SessionMetadata {
-    pub started_at: String,
-    pub model: String,
-    pub message_count: u32,
-    pub last_prompt: Option<String>,
-}
-
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Session {
     pub version: u32,
     pub messages: Vec<ConversationMessage>,
-    pub metadata: Option<SessionMetadata>,
 }
 
 #[derive(Debug)]
@@ -91,7 +82,6 @@ impl Session {
         Self {
             version: 1,
             messages: Vec::new(),
-            metadata: None,
         }
     }
 
@@ -121,9 +111,6 @@ impl Session {
                     .collect(),
             ),
         );
-        if let Some(metadata) = &self.metadata {
-            object.insert("metadata".to_string(), metadata.to_json());
-        }
         JsonValue::Object(object)
     }
 
@@ -144,15 +131,7 @@ impl Session {
             .iter()
             .map(ConversationMessage::from_json)
             .collect::<Result<Vec<_>, _>>()?;
-        let metadata = object
+        Ok(Self { version, messages })
-            .get("metadata")
-            .map(SessionMetadata::from_json)
-            .transpose()?;
-        Ok(Self {
-            version,
-            messages,
-            metadata,
-        })
     }
 }
 
@@ -162,41 +141,6 @@ impl Default for Session {
     }
 }
 
-impl SessionMetadata {
-    #[must_use]
-    pub fn to_json(&self) -> JsonValue {
-        let mut object = BTreeMap::new();
-        object.insert(
-            "started_at".to_string(),
-            JsonValue::String(self.started_at.clone()),
-        );
-        object.insert("model".to_string(), JsonValue::String(self.model.clone()));
-        object.insert(
-            "message_count".to_string(),
-            JsonValue::Number(i64::from(self.message_count)),
-        );
-        if let Some(last_prompt) = &self.last_prompt {
-            object.insert(
-                "last_prompt".to_string(),
-                JsonValue::String(last_prompt.clone()),
-            );
-        }
-        JsonValue::Object(object)
-    }
-
-    fn from_json(value: &JsonValue) -> Result<Self, SessionError> {
-        let object = value.as_object().ok_or_else(|| {
-            SessionError::Format("session metadata must be an object".to_string())
-        })?;
-        Ok(Self {
-            started_at: required_string(object, "started_at")?,
-            model: required_string(object, "model")?,
-            message_count: required_u32(object, "message_count")?,
-            last_prompt: optional_string(object, "last_prompt"),
-        })
-    }
-}
-
 impl ConversationMessage {
     #[must_use]
     pub fn user_text(text: impl Into<String>) -> Self {
@@ -424,13 +368,6 @@ fn required_string(
         .ok_or_else(|| SessionError::Format(format!("missing {key}")))
 }
 
-fn optional_string(object: &BTreeMap<String, JsonValue>, key: &str) -> Option<String> {
-    object
-        .get(key)
-        .and_then(JsonValue::as_str)
-        .map(ToOwned::to_owned)
-}
-
 fn required_u32(object: &BTreeMap<String, JsonValue>, key: &str) -> Result<u32, SessionError> {
     let value = object
         .get(key)
@@ -441,8 +378,7 @@ fn required_u32(object: &BTreeMap<String, JsonValue>, key: &str) -> Result<u32,
 
 #[cfg(test)]
 mod tests {
-    use super::{ContentBlock, ConversationMessage, MessageRole, Session, SessionMetadata};
+    use super::{ContentBlock, ConversationMessage, MessageRole, Session};
-    use crate::json::JsonValue;
     use crate::usage::TokenUsage;
     use std::fs;
     use std::time::{SystemTime, UNIX_EPOCH};
@@ -450,12 +386,6 @@ mod tests {
     #[test]
     fn persists_and_restores_session_json() {
         let mut session = Session::new();
-        session.metadata = Some(SessionMetadata {
-            started_at: "2026-04-01T00:00:00Z".to_string(),
-            model: "claude-sonnet".to_string(),
-            message_count: 3,
-            last_prompt: Some("hello".to_string()),
-        });
         session
             .messages
             .push(ConversationMessage::user_text("hello"));
@@ -498,23 +428,5 @@ mod tests {
             restored.messages[1].usage.expect("usage").total_tokens(),
             17
         );
-        assert_eq!(restored.metadata, session.metadata);
-    }
-
-    #[test]
-    fn loads_legacy_session_without_metadata() {
-        let legacy = r#"{
-  "version": 1,
-  "messages": [
-    {
-      "role": "user",
-      "blocks": [{"type": "text", "text": "hello"}]
-    }
-  ]
-}"#;
-        let restored = Session::from_json(&JsonValue::parse(legacy).expect("legacy json"))
-            .expect("legacy session should parse");
-        assert_eq!(restored.messages.len(), 1);
-        assert!(restored.metadata.is_none());
     }
 }

rust/crates/runtime/src/usage.rs

@@ -300,7 +300,6 @@ mod tests {
                     cache_read_input_tokens: 0,
                 }),
             }],
-            metadata: None,
         };
 
         let tracker = UsageTracker::from_session(&session);

rust/crates/rusty-claude-cli/src/init.rs

@@ -0,0 +1,433 @@
+use std::fs;
+use std::path::{Path, PathBuf};
+
+const STARTER_CLAUDE_JSON: &str = concat!(
+    "{\n",
+    "  \"permissions\": {\n",
+    "    \"defaultMode\": \"acceptEdits\"\n",
+    "  }\n",
+    "}\n",
+);
+const GITIGNORE_COMMENT: &str = "# Claude Code local artifacts";
+const GITIGNORE_ENTRIES: [&str; 2] = [".claude/settings.local.json", ".claude/sessions/"];
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub(crate) enum InitStatus {
+    Created,
+    Updated,
+    Skipped,
+}
+
+impl InitStatus {
+    #[must_use]
+    pub(crate) fn label(self) -> &'static str {
+        match self {
+            Self::Created => "created",
+            Self::Updated => "updated",
+            Self::Skipped => "skipped (already exists)",
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub(crate) struct InitArtifact {
+    pub(crate) name: &'static str,
+    pub(crate) status: InitStatus,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub(crate) struct InitReport {
+    pub(crate) project_root: PathBuf,
+    pub(crate) artifacts: Vec<InitArtifact>,
+}
+
+impl InitReport {
+    #[must_use]
+    pub(crate) fn render(&self) -> String {
+        let mut lines = vec![
+            "Init".to_string(),
+            format!("  Project          {}", self.project_root.display()),
+        ];
+        for artifact in &self.artifacts {
+            lines.push(format!(
+                "  {:<16} {}",
+                artifact.name,
+                artifact.status.label()
+            ));
+        }
+        lines.push("  Next step        Review and tailor the generated guidance".to_string());
+        lines.join("\n")
+    }
+}
+
+#[derive(Debug, Clone, Default, PartialEq, Eq)]
+#[allow(clippy::struct_excessive_bools)]
+struct RepoDetection {
+    rust_workspace: bool,
+    rust_root: bool,
+    python: bool,
+    package_json: bool,
+    typescript: bool,
+    nextjs: bool,
+    react: bool,
+    vite: bool,
+    nest: bool,
+    src_dir: bool,
+    tests_dir: bool,
+    rust_dir: bool,
+}
+
+pub(crate) fn initialize_repo(cwd: &Path) -> Result<InitReport, Box<dyn std::error::Error>> {
+    let mut artifacts = Vec::new();
+
+    let claude_dir = cwd.join(".claude");
+    artifacts.push(InitArtifact {
+        name: ".claude/",
+        status: ensure_dir(&claude_dir)?,
+    });
+
+    let claude_json = cwd.join(".claude.json");
+    artifacts.push(InitArtifact {
+        name: ".claude.json",
+        status: write_file_if_missing(&claude_json, STARTER_CLAUDE_JSON)?,
+    });
+
+    let gitignore = cwd.join(".gitignore");
+    artifacts.push(InitArtifact {
+        name: ".gitignore",
+        status: ensure_gitignore_entries(&gitignore)?,
+    });
+
+    let claude_md = cwd.join("CLAUDE.md");
+    let content = render_init_claude_md(cwd);
+    artifacts.push(InitArtifact {
+        name: "CLAUDE.md",
+        status: write_file_if_missing(&claude_md, &content)?,
+    });
+
+    Ok(InitReport {
+        project_root: cwd.to_path_buf(),
+        artifacts,
+    })
+}
+
+fn ensure_dir(path: &Path) -> Result<InitStatus, std::io::Error> {
+    if path.is_dir() {
+        return Ok(InitStatus::Skipped);
+    }
+    fs::create_dir_all(path)?;
+    Ok(InitStatus::Created)
+}
+
+fn write_file_if_missing(path: &Path, content: &str) -> Result<InitStatus, std::io::Error> {
+    if path.exists() {
+        return Ok(InitStatus::Skipped);
+    }
+    fs::write(path, content)?;
+    Ok(InitStatus::Created)
+}
+
+fn ensure_gitignore_entries(path: &Path) -> Result<InitStatus, std::io::Error> {
+    if !path.exists() {
+        let mut lines = vec![GITIGNORE_COMMENT.to_string()];
+        lines.extend(GITIGNORE_ENTRIES.iter().map(|entry| (*entry).to_string()));
+        fs::write(path, format!("{}\n", lines.join("\n")))?;
+        return Ok(InitStatus::Created);
+    }
+
+    let existing = fs::read_to_string(path)?;
+    let mut lines = existing.lines().map(ToOwned::to_owned).collect::<Vec<_>>();
+    let mut changed = false;
+
+    if !lines.iter().any(|line| line == GITIGNORE_COMMENT) {
+        lines.push(GITIGNORE_COMMENT.to_string());
+        changed = true;
+    }
+
+    for entry in GITIGNORE_ENTRIES {
+        if !lines.iter().any(|line| line == entry) {
+            lines.push(entry.to_string());
+            changed = true;
+        }
+    }
+
+    if !changed {
+        return Ok(InitStatus::Skipped);
+    }
+
+    fs::write(path, format!("{}\n", lines.join("\n")))?;
+    Ok(InitStatus::Updated)
+}
+
+pub(crate) fn render_init_claude_md(cwd: &Path) -> String {
+    let detection = detect_repo(cwd);
+    let mut lines = vec![
+        "# CLAUDE.md".to_string(),
+        String::new(),
+        "This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.".to_string(),
+        String::new(),
+    ];
+
+    let detected_languages = detected_languages(&detection);
+    let detected_frameworks = detected_frameworks(&detection);
+    lines.push("## Detected stack".to_string());
+    if detected_languages.is_empty() {
+        lines.push("- No specific language markers were detected yet; document the primary language and verification commands once the project structure settles.".to_string());
+    } else {
+        lines.push(format!("- Languages: {}.", detected_languages.join(", ")));
+    }
+    if detected_frameworks.is_empty() {
+        lines.push("- Frameworks: none detected from the supported starter markers.".to_string());
+    } else {
+        lines.push(format!(
+            "- Frameworks/tooling markers: {}.",
+            detected_frameworks.join(", ")
+        ));
+    }
+    lines.push(String::new());
+
+    let verification_lines = verification_lines(cwd, &detection);
+    if !verification_lines.is_empty() {
+        lines.push("## Verification".to_string());
+        lines.extend(verification_lines);
+        lines.push(String::new());
+    }
+
+    let structure_lines = repository_shape_lines(&detection);
+    if !structure_lines.is_empty() {
+        lines.push("## Repository shape".to_string());
+        lines.extend(structure_lines);
+        lines.push(String::new());
+    }
+
+    let framework_lines = framework_notes(&detection);
+    if !framework_lines.is_empty() {
+        lines.push("## Framework notes".to_string());
+        lines.extend(framework_lines);
+        lines.push(String::new());
+    }
+
+    lines.push("## Working agreement".to_string());
+    lines.push("- Prefer small, reviewable changes and keep generated bootstrap files aligned with actual repo workflows.".to_string());
+    lines.push("- Keep shared defaults in `.claude.json`; reserve `.claude/settings.local.json` for machine-local overrides.".to_string());
+    lines.push("- Do not overwrite existing `CLAUDE.md` content automatically; update it intentionally when repo workflows change.".to_string());
+    lines.push(String::new());
+
+    lines.join("\n")
+}
+
+fn detect_repo(cwd: &Path) -> RepoDetection {
+    let package_json_contents = fs::read_to_string(cwd.join("package.json"))
+        .unwrap_or_default()
+        .to_ascii_lowercase();
+    RepoDetection {
+        rust_workspace: cwd.join("rust").join("Cargo.toml").is_file(),
+        rust_root: cwd.join("Cargo.toml").is_file(),
+        python: cwd.join("pyproject.toml").is_file()
+            || cwd.join("requirements.txt").is_file()
+            || cwd.join("setup.py").is_file(),
+        package_json: cwd.join("package.json").is_file(),
+        typescript: cwd.join("tsconfig.json").is_file()
+            || package_json_contents.contains("typescript"),
+        nextjs: package_json_contents.contains("\"next\""),
+        react: package_json_contents.contains("\"react\""),
+        vite: package_json_contents.contains("\"vite\""),
+        nest: package_json_contents.contains("@nestjs"),
+        src_dir: cwd.join("src").is_dir(),
+        tests_dir: cwd.join("tests").is_dir(),
+        rust_dir: cwd.join("rust").is_dir(),
+    }
+}
+
+fn detected_languages(detection: &RepoDetection) -> Vec<&'static str> {
+    let mut languages = Vec::new();
+    if detection.rust_workspace || detection.rust_root {
+        languages.push("Rust");
+    }
+    if detection.python {
+        languages.push("Python");
+    }
+    if detection.typescript {
+        languages.push("TypeScript");
+    } else if detection.package_json {
+        languages.push("JavaScript/Node.js");
+    }
+    languages
+}
+
+fn detected_frameworks(detection: &RepoDetection) -> Vec<&'static str> {
+    let mut frameworks = Vec::new();
+    if detection.nextjs {
+        frameworks.push("Next.js");
+    }
+    if detection.react {
+        frameworks.push("React");
+    }
+    if detection.vite {
+        frameworks.push("Vite");
+    }
+    if detection.nest {
+        frameworks.push("NestJS");
+    }
+    frameworks
+}
+
+fn verification_lines(cwd: &Path, detection: &RepoDetection) -> Vec<String> {
+    let mut lines = Vec::new();
+    if detection.rust_workspace {
+        lines.push("- Run Rust verification from `rust/`: `cargo fmt`, `cargo clippy --workspace --all-targets -- -D warnings`, `cargo test --workspace`".to_string());
+    } else if detection.rust_root {
+        lines.push("- Run Rust verification from the repo root: `cargo fmt`, `cargo clippy --workspace --all-targets -- -D warnings`, `cargo test --workspace`".to_string());
+    }
+    if detection.python {
+        if cwd.join("pyproject.toml").is_file() {
+            lines.push("- Run the Python project checks declared in `pyproject.toml` (for example: `pytest`, `ruff check`, and `mypy` when configured).".to_string());
+        } else {
+            lines.push(
+                "- Run the repo's Python test/lint commands before shipping changes.".to_string(),
+            );
+        }
+    }
+    if detection.package_json {
+        lines.push("- Run the JavaScript/TypeScript checks from `package.json` before shipping changes (`npm test`, `npm run lint`, `npm run build`, or the repo equivalent).".to_string());
+    }
+    if detection.tests_dir && detection.src_dir {
+        lines.push("- `src/` and `tests/` are both present; update both surfaces together when behavior changes.".to_string());
+    }
+    lines
+}
+
+fn repository_shape_lines(detection: &RepoDetection) -> Vec<String> {
+    let mut lines = Vec::new();
+    if detection.rust_dir {
+        lines.push(
+            "- `rust/` contains the Rust workspace and active CLI/runtime implementation."
+                .to_string(),
+        );
+    }
+    if detection.src_dir {
+        lines.push("- `src/` contains source files that should stay consistent with generated guidance and tests.".to_string());
+    }
+    if detection.tests_dir {
+        lines.push("- `tests/` contains validation surfaces that should be reviewed alongside code changes.".to_string());
+    }
+    lines
+}
+
+fn framework_notes(detection: &RepoDetection) -> Vec<String> {
+    let mut lines = Vec::new();
+    if detection.nextjs {
+        lines.push("- Next.js detected: preserve routing/data-fetching conventions and verify production builds after changing app structure.".to_string());
+    }
+    if detection.react && !detection.nextjs {
+        lines.push("- React detected: keep component behavior covered with focused tests and avoid unnecessary prop/API churn.".to_string());
+    }
+    if detection.vite {
+        lines.push("- Vite detected: validate the production bundle after changing build-sensitive configuration or imports.".to_string());
+    }
+    if detection.nest {
+        lines.push("- NestJS detected: keep module/provider boundaries explicit and verify controller/service wiring after refactors.".to_string());
+    }
+    lines
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{initialize_repo, render_init_claude_md};
+    use std::fs;
+    use std::path::Path;
+    use std::time::{SystemTime, UNIX_EPOCH};
+
+    fn temp_dir() -> std::path::PathBuf {
+        let nanos = SystemTime::now()
+            .duration_since(UNIX_EPOCH)
+            .expect("time should be after epoch")
+            .as_nanos();
+        std::env::temp_dir().join(format!("rusty-claude-init-{nanos}"))
+    }
+
+    #[test]
+    fn initialize_repo_creates_expected_files_and_gitignore_entries() {
+        let root = temp_dir();
+        fs::create_dir_all(root.join("rust")).expect("create rust dir");
+        fs::write(root.join("rust").join("Cargo.toml"), "[workspace]\n").expect("write cargo");
+
+        let report = initialize_repo(&root).expect("init should succeed");
+        let rendered = report.render();
+        assert!(rendered.contains(".claude/         created"));
+        assert!(rendered.contains(".claude.json     created"));
+        assert!(rendered.contains(".gitignore       created"));
+        assert!(rendered.contains("CLAUDE.md        created"));
+        assert!(root.join(".claude").is_dir());
+        assert!(root.join(".claude.json").is_file());
+        assert!(root.join("CLAUDE.md").is_file());
+        assert_eq!(
+            fs::read_to_string(root.join(".claude.json")).expect("read claude json"),
+            concat!(
+                "{\n",
+                "  \"permissions\": {\n",
+                "    \"defaultMode\": \"acceptEdits\"\n",
+                "  }\n",
+                "}\n",
+            )
+        );
+        let gitignore = fs::read_to_string(root.join(".gitignore")).expect("read gitignore");
+        assert!(gitignore.contains(".claude/settings.local.json"));
+        assert!(gitignore.contains(".claude/sessions/"));
+        let claude_md = fs::read_to_string(root.join("CLAUDE.md")).expect("read claude md");
+        assert!(claude_md.contains("Languages: Rust."));
+        assert!(claude_md.contains("cargo clippy --workspace --all-targets -- -D warnings"));
+
+        fs::remove_dir_all(root).expect("cleanup temp dir");
+    }
+
+    #[test]
+    fn initialize_repo_is_idempotent_and_preserves_existing_files() {
+        let root = temp_dir();
+        fs::create_dir_all(&root).expect("create root");
+        fs::write(root.join("CLAUDE.md"), "custom guidance\n").expect("write existing claude md");
+        fs::write(root.join(".gitignore"), ".claude/settings.local.json\n")
+            .expect("write gitignore");
+
+        let first = initialize_repo(&root).expect("first init should succeed");
+        assert!(first
+            .render()
+            .contains("CLAUDE.md        skipped (already exists)"));
+        let second = initialize_repo(&root).expect("second init should succeed");
+        let second_rendered = second.render();
+        assert!(second_rendered.contains(".claude/         skipped (already exists)"));
+        assert!(second_rendered.contains(".claude.json     skipped (already exists)"));
+        assert!(second_rendered.contains(".gitignore       skipped (already exists)"));
+        assert!(second_rendered.contains("CLAUDE.md        skipped (already exists)"));
+        assert_eq!(
+            fs::read_to_string(root.join("CLAUDE.md")).expect("read existing claude md"),
+            "custom guidance\n"
+        );
+        let gitignore = fs::read_to_string(root.join(".gitignore")).expect("read gitignore");
+        assert_eq!(gitignore.matches(".claude/settings.local.json").count(), 1);
+        assert_eq!(gitignore.matches(".claude/sessions/").count(), 1);
+
+        fs::remove_dir_all(root).expect("cleanup temp dir");
+    }
+
+    #[test]
+    fn render_init_template_mentions_detected_python_and_nextjs_markers() {
+        let root = temp_dir();
+        fs::create_dir_all(&root).expect("create root");
+        fs::write(root.join("pyproject.toml"), "[project]\nname = \"demo\"\n")
+            .expect("write pyproject");
+        fs::write(
+            root.join("package.json"),
+            r#"{"dependencies":{"next":"14.0.0","react":"18.0.0"},"devDependencies":{"typescript":"5.0.0"}}"#,
+        )
+        .expect("write package json");
+
+        let rendered = render_init_claude_md(Path::new(&root));
+        assert!(rendered.contains("Languages: Python, TypeScript."));
+        assert!(rendered.contains("Frameworks/tooling markers: Next.js, React."));
+        assert!(rendered.contains("pyproject.toml"));
+        assert!(rendered.contains("Next.js detected"));
+
+        fs::remove_dir_all(root).expect("cleanup temp dir");
+    }
+}

rust/crates/rusty-claude-cli/src/main.rs

@@ -1,3 +1,4 @@
+mod init;
 mod input;
 mod render;
 
@@ -20,6 +21,7 @@ use commands::{
     render_slash_command_help, resume_supported_slash_commands, slash_command_specs, SlashCommand,
 };
 use compat_harness::{extract_manifest, UpstreamPaths};
+use init::initialize_repo;
 use render::{Spinner, TerminalRenderer};
 use runtime::{
     clear_oauth_credentials, generate_pkce_pair, generate_state, load_system_prompt,
@@ -27,7 +29,7 @@ use runtime::{
     AssistantEvent, CompactionConfig, ConfigLoader, ConfigSource, ContentBlock,
     ConversationMessage, ConversationRuntime, MessageRole, OAuthAuthorizationRequest,
     OAuthTokenExchangeRequest, PermissionMode, PermissionPolicy, ProjectContext, RuntimeError,
-    Session, SessionMetadata, TokenUsage, ToolError, ToolExecutor, UsageTracker,
+    Session, TokenUsage, ToolError, ToolExecutor, UsageTracker,
 };
 use serde_json::json;
 use tools::{execute_tool, mvp_tool_specs, ToolSpec};
@@ -37,7 +39,6 @@ const DEFAULT_MAX_TOKENS: u32 = 32;
 const DEFAULT_DATE: &str = "2026-03-31";
 const DEFAULT_OAUTH_CALLBACK_PORT: u16 = 4545;
 const VERSION: &str = env!("CARGO_PKG_VERSION");
-const OLD_SESSION_COMPACTION_AGE_SECS: u64 = 60 * 60 * 24;
 const BUILD_TARGET: Option<&str> = option_env!("TARGET");
 const GIT_SHA: Option<&str> = option_env!("GIT_SHA");
 
@@ -75,6 +76,7 @@ fn run() -> Result<(), Box<dyn std::error::Error>> {
             .run_turn_with_output(&prompt, output_format)?,
         CliAction::Login => run_login()?,
         CliAction::Logout => run_logout()?,
+        CliAction::Init => run_init()?,
         CliAction::Repl {
             model,
             allowed_tools,
@@ -107,6 +109,7 @@ enum CliAction {
     },
     Login,
     Logout,
+    Init,
     Repl {
         model: String,
         allowed_tools: Option<AllowedToolSet>,
@@ -231,6 +234,7 @@ fn parse_args(args: &[String]) -> Result<CliAction, String> {
         "system-prompt" => parse_system_prompt_args(&rest[1..]),
         "login" => Ok(CliAction::Login),
         "logout" => Ok(CliAction::Logout),
+        "init" => Ok(CliAction::Init),
         "prompt" => {
             let prompt = rest[1..].join(" ");
             if prompt.trim().is_empty() {
@@ -536,14 +540,7 @@ fn print_version() {
 }
 
 fn resume_session(session_path: &Path, commands: &[String]) {
-    let handle = match resolve_session_reference(&session_path.display().to_string()) {
+    let session = match Session::load_from_path(session_path) {
-        Ok(handle) => handle,
-        Err(error) => {
-            eprintln!("failed to resolve session: {error}");
-            std::process::exit(1);
-        }
-    };
-    let session = match Session::load_from_path(&handle.path) {
         Ok(session) => session,
         Err(error) => {
             eprintln!("failed to restore session: {error}");
@@ -554,7 +551,7 @@ fn resume_session(session_path: &Path, commands: &[String]) {
     if commands.is_empty() {
         println!(
             "Restored session from {} ({} messages).",
-            handle.path.display(),
+            session_path.display(),
             session.messages.len()
         );
         return;
@@ -566,7 +563,7 @@ fn resume_session(session_path: &Path, commands: &[String]) {
             eprintln!("unsupported resumed command: {raw_command}");
             std::process::exit(2);
         };
-        match run_resume_command(&handle.path, &session, &command) {
+        match run_resume_command(session_path, &session, &command) {
             Ok(ResumeCommandOutcome {
                 session: next_session,
                 message,
@@ -711,26 +708,6 @@ fn format_resume_report(session_path: &str, message_count: usize, turns: u32) ->
     )
 }
 
-fn format_init_report(path: &Path, created: bool) -> String {
-    if created {
-        format!(
-            "Init
-  CLAUDE.md        {}
-  Result           created
-  Next step        Review and tailor the generated guidance",
-            path.display()
-        )
-    } else {
-        format!(
-            "Init
-  CLAUDE.md        {}
-  Result           skipped (already exists)
-  Next step        Edit the existing file intentionally if workflows changed",
-            path.display()
-        )
-    }
-}
-
 fn format_compact_report(removed: usize, resulting_messages: usize, skipped: bool) -> String {
     if skipped {
         format!(
@@ -891,7 +868,6 @@ fn run_resume_command(
         | SlashCommand::Model { .. }
         | SlashCommand::Permissions { .. }
         | SlashCommand::Session { .. }
-        | SlashCommand::Sessions
         | SlashCommand::Unknown(_) => Err("unsupported resumed slash command".into()),
     }
 }
@@ -948,9 +924,6 @@ struct ManagedSessionSummary {
     path: PathBuf,
     modified_epoch_secs: u64,
     message_count: usize,
-    model: Option<String>,
-    started_at: Option<String>,
-    last_prompt: Option<String>,
 }
 
 struct LiveCli {
@@ -971,7 +944,6 @@ impl LiveCli {
     ) -> Result<Self, Box<dyn std::error::Error>> {
         let system_prompt = build_system_prompt()?;
         let session = create_managed_session_handle()?;
-        auto_compact_inactive_sessions(&session.id)?;
         let runtime = build_runtime(
             Session::new(),
             model.clone(),
@@ -1125,7 +1097,7 @@ impl LiveCli {
                 false
             }
             SlashCommand::Init => {
-                Self::run_init()?;
+                run_init()?;
                 false
             }
             SlashCommand::Diff => {
@@ -1143,10 +1115,6 @@ impl LiveCli {
             SlashCommand::Session { action, target } => {
                 self.handle_session_command(action.as_deref(), target.as_deref())?
             }
-            SlashCommand::Sessions => {
-                println!("{}", render_session_list(&self.session.id)?);
-                false
-            }
             SlashCommand::Unknown(name) => {
                 eprintln!("unknown slash command: /{name}");
                 false
@@ -1155,10 +1123,7 @@ impl LiveCli {
     }
 
     fn persist_session(&self) -> Result<(), Box<dyn std::error::Error>> {
-        let mut session = self.runtime.session().clone();
+        self.runtime.session().save_to_path(&self.session.path)?;
-        session.metadata = Some(derive_session_metadata(&session, &self.model));
-        session.save_to_path(&self.session.path)?;
-        auto_compact_inactive_sessions(&self.session.id)?;
         Ok(())
     }
 
@@ -1303,20 +1268,13 @@ impl LiveCli {
         session_path: Option<String>,
     ) -> Result<bool, Box<dyn std::error::Error>> {
         let Some(session_ref) = session_path else {
-            println!("Usage: /resume <session-id-or-path>");
+            println!("Usage: /resume <session-path>");
             return Ok(false);
         };
 
         let handle = resolve_session_reference(&session_ref)?;
         let session = Session::load_from_path(&handle.path)?;
         let message_count = session.messages.len();
-        if let Some(model) = session
-            .metadata
-            .as_ref()
-            .map(|metadata| metadata.model.clone())
-        {
-            self.model = model;
-        }
         self.runtime = build_runtime(
             session,
             self.model.clone(),
@@ -1347,11 +1305,6 @@ impl LiveCli {
         Ok(())
     }
 
-    fn run_init() -> Result<(), Box<dyn std::error::Error>> {
-        println!("{}", init_claude_md()?);
-        Ok(())
-    }
-
     fn print_diff() -> Result<(), Box<dyn std::error::Error>> {
         println!("{}", render_diff_report()?);
         Ok(())
@@ -1393,13 +1346,6 @@ impl LiveCli {
                 let handle = resolve_session_reference(target)?;
                 let session = Session::load_from_path(&handle.path)?;
                 let message_count = session.messages.len();
-                if let Some(model) = session
-                    .metadata
-                    .as_ref()
-                    .map(|metadata| metadata.model.clone())
-                {
-                    self.model = model;
-                }
                 self.runtime = build_runtime(
                     session,
                     self.model.clone(),
@@ -1444,10 +1390,8 @@ impl LiveCli {
 }
 
 fn sessions_dir() -> Result<PathBuf, Box<dyn std::error::Error>> {
-    let home = env::var_os("HOME")
+    let cwd = env::current_dir()?;
-        .map(PathBuf::from)
+    let path = cwd.join(".claude").join("sessions");
-        .ok_or_else(|| io::Error::new(io::ErrorKind::NotFound, "HOME is not set"))?;
-    let path = home.join(".claude").join("sessions");
     fs::create_dir_all(&path)?;
     Ok(path)
 }
@@ -1468,19 +1412,8 @@ fn generate_session_id() -> String {
 
 fn resolve_session_reference(reference: &str) -> Result<SessionHandle, Box<dyn std::error::Error>> {
     let direct = PathBuf::from(reference);
-    let expanded = if let Some(stripped) = reference.strip_prefix("~/") {
-        sessions_dir()?
-            .parent()
-            .and_then(|claude| claude.parent())
-            .map(|home| home.join(stripped))
-            .unwrap_or(direct.clone())
-    } else {
-        direct.clone()
-    };
     let path = if direct.exists() {
         direct
-    } else if expanded.exists() {
-        expanded
     } else {
         sessions_dir()?.join(format!("{reference}.json"))
     };
@@ -1510,11 +1443,9 @@ fn list_managed_sessions() -> Result<Vec<ManagedSessionSummary>, Box<dyn std::er
             .and_then(|time| time.duration_since(UNIX_EPOCH).ok())
             .map(|duration| duration.as_secs())
             .unwrap_or_default();
-        let session = Session::load_from_path(&path).ok();
+        let message_count = Session::load_from_path(&path)
-        let derived_message_count = session.as_ref().map_or(0, |session| session.messages.len());
+            .map(|session| session.messages.len())
-        let stored = session
+            .unwrap_or_default();
-            .as_ref()
-            .and_then(|session| session.metadata.as_ref());
         let id = path
             .file_stem()
             .and_then(|value| value.to_str())
@@ -1524,12 +1455,7 @@ fn list_managed_sessions() -> Result<Vec<ManagedSessionSummary>, Box<dyn std::er
             id,
             path,
             modified_epoch_secs,
-            message_count: stored.map_or(derived_message_count, |metadata| {
+            message_count,
-                metadata.message_count as usize
-            }),
-            model: stored.map(|metadata| metadata.model.clone()),
-            started_at: stored.map(|metadata| metadata.started_at.clone()),
-            last_prompt: stored.and_then(|metadata| metadata.last_prompt.clone()),
         });
     }
     sessions.sort_by(|left, right| right.modified_epoch_secs.cmp(&left.modified_epoch_secs));
@@ -1552,99 +1478,17 @@ fn render_session_list(active_session_id: &str) -> Result<String, Box<dyn std::e
         } else {
             "○ saved"
         };
-        let model = session.model.as_deref().unwrap_or("unknown");
-        let started = session.started_at.as_deref().unwrap_or("unknown");
-        let last_prompt = session.last_prompt.as_deref().map_or_else(
-            || "-".to_string(),
-            |prompt| truncate_for_summary(prompt, 36),
-        );
         lines.push(format!(
-            "  {id:<20} {marker:<10} msgs={msgs:<4} model={model:<24} started={started} modified={modified} last={last_prompt} path={path}",
+            "  {id:<20} {marker:<10} msgs={msgs:<4} modified={modified} path={path}",
             id = session.id,
             msgs = session.message_count,
-            model = model,
-            started = started,
             modified = session.modified_epoch_secs,
-            last_prompt = last_prompt,
             path = session.path.display(),
         ));
     }
     Ok(lines.join("\n"))
 }
 
-fn current_epoch_secs() -> u64 {
-    SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .map(|duration| duration.as_secs())
-        .unwrap_or_default()
-}
-
-fn current_timestamp_rfc3339ish() -> String {
-    format!("{}Z", current_epoch_secs())
-}
-
-fn last_prompt_from_session(session: &Session) -> Option<String> {
-    session
-        .messages
-        .iter()
-        .rev()
-        .find(|message| message.role == MessageRole::User)
-        .and_then(|message| {
-            message.blocks.iter().find_map(|block| match block {
-                ContentBlock::Text { text } => Some(text.trim().to_string()),
-                _ => None,
-            })
-        })
-        .filter(|text| !text.is_empty())
-}
-
-fn derive_session_metadata(session: &Session, model: &str) -> SessionMetadata {
-    let started_at = session
-        .metadata
-        .as_ref()
-        .map_or_else(current_timestamp_rfc3339ish, |metadata| {
-            metadata.started_at.clone()
-        });
-    SessionMetadata {
-        started_at,
-        model: model.to_string(),
-        message_count: session.messages.len().try_into().unwrap_or(u32::MAX),
-        last_prompt: last_prompt_from_session(session),
-    }
-}
-
-fn session_age_secs(modified_epoch_secs: u64) -> u64 {
-    current_epoch_secs().saturating_sub(modified_epoch_secs)
-}
-
-fn auto_compact_inactive_sessions(
-    active_session_id: &str,
-) -> Result<(), Box<dyn std::error::Error>> {
-    for summary in list_managed_sessions()? {
-        if summary.id == active_session_id
-            || session_age_secs(summary.modified_epoch_secs) < OLD_SESSION_COMPACTION_AGE_SECS
-        {
-            continue;
-        }
-        let path = summary.path.clone();
-        let Ok(session) = Session::load_from_path(&path) else {
-            continue;
-        };
-        if !runtime::should_compact(&session, CompactionConfig::default()) {
-            continue;
-        }
-        let mut compacted =
-            runtime::compact_session(&session, CompactionConfig::default()).compacted_session;
-        let model = compacted.metadata.as_ref().map_or_else(
-            || DEFAULT_MODEL.to_string(),
-            |metadata| metadata.model.clone(),
-        );
-        compacted.metadata = Some(derive_session_metadata(&compacted, &model));
-        compacted.save_to_path(&path)?;
-    }
-    Ok(())
-}
-
 fn render_repl_help() -> String {
     [
         "REPL".to_string(),
@@ -1858,67 +1702,12 @@ fn render_memory_report() -> Result<String, Box<dyn std::error::Error>> {
 
 fn init_claude_md() -> Result<String, Box<dyn std::error::Error>> {
     let cwd = env::current_dir()?;
-    let claude_md = cwd.join("CLAUDE.md");
+    Ok(initialize_repo(&cwd)?.render())
-    if claude_md.exists() {
-        return Ok(format_init_report(&claude_md, false));
-    }
-
-    let content = render_init_claude_md(&cwd);
-    fs::write(&claude_md, content)?;
-    Ok(format_init_report(&claude_md, true))
 }
 
-fn render_init_claude_md(cwd: &Path) -> String {
+fn run_init() -> Result<(), Box<dyn std::error::Error>> {
-    let mut lines = vec![
+    println!("{}", init_claude_md()?);
-        "# CLAUDE.md".to_string(),
+    Ok(())
-        String::new(),
-        "This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.".to_string(),
-        String::new(),
-    ];
-
-    let mut command_lines = Vec::new();
-    if cwd.join("rust").join("Cargo.toml").is_file() {
-        command_lines.push("- Run Rust verification from `rust/`: `cargo fmt`, `cargo clippy --workspace --all-targets -- -D warnings`, `cargo test --workspace`".to_string());
-    } else if cwd.join("Cargo.toml").is_file() {
-        command_lines.push("- Run Rust verification from the repo root: `cargo fmt`, `cargo clippy --workspace --all-targets -- -D warnings`, `cargo test --workspace`".to_string());
-    }
-    if cwd.join("tests").is_dir() && cwd.join("src").is_dir() {
-        command_lines.push("- `src/` and `tests/` are also present; check those surfaces before removing or renaming Python-era compatibility assets.".to_string());
-    }
-    if !command_lines.is_empty() {
-        lines.push("## Verification".to_string());
-        lines.extend(command_lines);
-        lines.push(String::new());
-    }
-
-    let mut structure_lines = Vec::new();
-    if cwd.join("rust").is_dir() {
-        structure_lines.push(
-            "- `rust/` contains the Rust workspace and the active CLI/runtime implementation."
-                .to_string(),
-        );
-    }
-    if cwd.join("src").is_dir() {
-        structure_lines.push("- `src/` contains the older Python-first workspace artifacts referenced by the repo history and tests.".to_string());
-    }
-    if cwd.join("tests").is_dir() {
-        structure_lines.push("- `tests/` exercises compatibility and porting behavior across the repository surfaces.".to_string());
-    }
-    if !structure_lines.is_empty() {
-        lines.push("## Repository shape".to_string());
-        lines.extend(structure_lines);
-        lines.push(String::new());
-    }
-
-    lines.push("## Working agreement".to_string());
-    lines.push("- Prefer small, reviewable Rust changes and keep slash-command behavior aligned between the shared command registry and the CLI entrypoints.".to_string());
-    lines.push("- Do not overwrite existing CLAUDE.md content automatically; update it intentionally when repo workflows change.".to_string());
-    lines.push(String::new());
-
-    lines.join(
-        "
-",
-    )
 }
 
 fn normalize_permission_mode(mode: &str) -> Option<&'static str> {
@@ -2477,34 +2266,65 @@ fn convert_messages(messages: &[ConversationMessage]) -> Vec<InputMessage> {
         .collect()
 }
 
-fn print_help() {
+fn print_help_to(out: &mut impl Write) -> io::Result<()> {
-    println!("rusty-claude-cli v{VERSION}");
+    writeln!(out, "rusty-claude-cli v{VERSION}")?;
-    println!();
+    writeln!(out)?;
-    println!("Usage:");
+    writeln!(out, "Usage:")?;
-    println!("  rusty-claude-cli [--model MODEL] [--allowedTools TOOL[,TOOL...]]");
+    writeln!(
-    println!("      Start the interactive REPL");
+        out,
-    println!("  rusty-claude-cli [--model MODEL] [--output-format text|json] prompt TEXT");
+        "  rusty-claude-cli [--model MODEL] [--allowedTools TOOL[,TOOL...]]"
-    println!("      Send one prompt and exit");
+    )?;
-    println!("  rusty-claude-cli [--model MODEL] [--output-format text|json] TEXT");
+    writeln!(out, "      Start the interactive REPL")?;
-    println!("      Shorthand non-interactive prompt mode");
+    writeln!(
-    println!("  rusty-claude-cli --resume SESSION.json [/status] [/compact] [...]");
+        out,
-    println!("      Inspect or maintain a saved session without entering the REPL");
+        "  rusty-claude-cli [--model MODEL] [--output-format text|json] prompt TEXT"
-    println!("  rusty-claude-cli dump-manifests");
+    )?;
-    println!("  rusty-claude-cli bootstrap-plan");
+    writeln!(out, "      Send one prompt and exit")?;
-    println!("  rusty-claude-cli system-prompt [--cwd PATH] [--date YYYY-MM-DD]");
+    writeln!(
-    println!("  rusty-claude-cli login");
+        out,
-    println!("  rusty-claude-cli logout");
+        "  rusty-claude-cli [--model MODEL] [--output-format text|json] TEXT"
-    println!();
+    )?;
-    println!("Flags:");
+    writeln!(out, "      Shorthand non-interactive prompt mode")?;
-    println!("  --model MODEL              Override the active model");
+    writeln!(
-    println!("  --output-format FORMAT     Non-interactive output format: text or json");
+        out,
-    println!("  --permission-mode MODE     Set read-only, workspace-write, or danger-full-access");
+        "  rusty-claude-cli --resume SESSION.json [/status] [/compact] [...]"
-    println!("  --allowedTools TOOLS       Restrict enabled tools (repeatable; comma-separated aliases supported)");
+    )?;
-    println!("  --version, -V              Print version and build information locally");
+    writeln!(
-    println!();
+        out,
-    println!("Interactive slash commands:");
+        "      Inspect or maintain a saved session without entering the REPL"
-    println!("{}", render_slash_command_help());
+    )?;
-    println!();
+    writeln!(out, "  rusty-claude-cli dump-manifests")?;
+    writeln!(out, "  rusty-claude-cli bootstrap-plan")?;
+    writeln!(
+        out,
+        "  rusty-claude-cli system-prompt [--cwd PATH] [--date YYYY-MM-DD]"
+    )?;
+    writeln!(out, "  rusty-claude-cli login")?;
+    writeln!(out, "  rusty-claude-cli logout")?;
+    writeln!(out, "  rusty-claude-cli init")?;
+    writeln!(out)?;
+    writeln!(out, "Flags:")?;
+    writeln!(
+        out,
+        "  --model MODEL              Override the active model"
+    )?;
+    writeln!(
+        out,
+        "  --output-format FORMAT     Non-interactive output format: text or json"
+    )?;
+    writeln!(
+        out,
+        "  --permission-mode MODE     Set read-only, workspace-write, or danger-full-access"
+    )?;
+    writeln!(out, "  --allowedTools TOOLS       Restrict enabled tools (repeatable; comma-separated aliases supported)")?;
+    writeln!(
+        out,
+        "  --version, -V              Print version and build information locally"
+    )?;
+    writeln!(out)?;
+    writeln!(out, "Interactive slash commands:")?;
+    writeln!(out, "{}", render_slash_command_help())?;
+    writeln!(out)?;
     let resume_commands = resume_supported_slash_commands()
         .into_iter()
         .map(|spec| match spec.argument_hint {
@@ -2513,84 +2333,46 @@ fn print_help() {
         })
         .collect::<Vec<_>>()
         .join(", ");
-    println!("Resume-safe commands: {resume_commands}");
+    writeln!(out, "Resume-safe commands: {resume_commands}")?;
-    println!("Examples:");
+    writeln!(out, "Examples:")?;
-    println!("  rusty-claude-cli --model claude-opus \"summarize this repo\"");
+    writeln!(
-    println!("  rusty-claude-cli --output-format json prompt \"explain src/main.rs\"");
+        out,
-    println!("  rusty-claude-cli --allowedTools read,glob \"summarize Cargo.toml\"");
+        "  rusty-claude-cli --model claude-opus \"summarize this repo\""
-    println!("  rusty-claude-cli --resume session.json /status /diff /export notes.txt");
+    )?;
-    println!("  rusty-claude-cli login");
+    writeln!(
+        out,
+        "  rusty-claude-cli --output-format json prompt \"explain src/main.rs\""
+    )?;
+    writeln!(
+        out,
+        "  rusty-claude-cli --allowedTools read,glob \"summarize Cargo.toml\""
+    )?;
+    writeln!(
+        out,
+        "  rusty-claude-cli --resume session.json /status /diff /export notes.txt"
+    )?;
+    writeln!(out, "  rusty-claude-cli login")?;
+    writeln!(out, "  rusty-claude-cli init")?;
+    Ok(())
+}
+
+fn print_help() {
+    let _ = print_help_to(&mut io::stdout());
 }
 
 #[cfg(test)]
 mod tests {
     use super::{
-        derive_session_metadata, filter_tool_specs, format_compact_report, format_cost_report,
+        filter_tool_specs, format_compact_report, format_cost_report, format_model_report,
-        format_init_report, format_model_report, format_model_switch_report,
+        format_model_switch_report, format_permissions_report, format_permissions_switch_report,
-        format_permissions_report, format_permissions_switch_report, format_resume_report,
+        format_resume_report, format_status_report, format_tool_call_start, format_tool_result,
-        format_status_report, format_tool_call_start, format_tool_result, list_managed_sessions,
+        normalize_permission_mode, parse_args, parse_git_status_metadata, print_help_to,
-        normalize_permission_mode, parse_args, parse_git_status_metadata, render_config_report,
+        render_config_report, render_memory_report, render_repl_help,
-        render_init_claude_md, render_memory_report, render_repl_help,
+        resume_supported_slash_commands, status_context, CliAction, CliOutputFormat, SlashCommand,
-        resume_supported_slash_commands, sessions_dir, status_context, CliAction, CliOutputFormat,
+        StatusUsage, DEFAULT_MODEL,
-        SlashCommand, StatusUsage, DEFAULT_MODEL,
     };
-    use runtime::{ContentBlock, ConversationMessage, MessageRole, PermissionMode, Session};
+    use runtime::{ContentBlock, ConversationMessage, MessageRole, PermissionMode};
-    use std::fs;
+    use std::path::PathBuf;
-    use std::path::{Path, PathBuf};
-
-    #[test]
-    fn derive_session_metadata_recomputes_prompt_and_count() {
-        let mut session = Session::new();
-        session
-            .messages
-            .push(ConversationMessage::user_text("first prompt"));
-        session
-            .messages
-            .push(ConversationMessage::assistant(vec![ContentBlock::Text {
-                text: "reply".to_string(),
-            }]));
-        let metadata = derive_session_metadata(&session, "claude-test");
-        assert_eq!(metadata.model, "claude-test");
-        assert_eq!(metadata.message_count, 2);
-        assert_eq!(metadata.last_prompt.as_deref(), Some("first prompt"));
-        assert!(metadata.started_at.ends_with('Z'));
-    }
-
-    #[test]
-    fn managed_sessions_use_home_directory_and_list_metadata() {
-        let temp =
-            std::env::temp_dir().join(format!("rusty-claude-cli-home-{}", std::process::id()));
-        let _ = fs::remove_dir_all(&temp);
-        fs::create_dir_all(&temp).expect("temp home should exist");
-        let previous_home = std::env::var_os("HOME");
-        std::env::set_var("HOME", &temp);
-
-        let dir = sessions_dir().expect("sessions dir");
-        assert_eq!(dir, temp.join(".claude").join("sessions"));
-
-        let mut session = Session::new();
-        session
-            .messages
-            .push(ConversationMessage::user_text("persist me"));
-        session.metadata = Some(derive_session_metadata(&session, "claude-home"));
-        let file = dir.join("session-test.json");
-        session.save_to_path(&file).expect("session save");
-
-        let listed = list_managed_sessions().expect("session list");
-        let found = listed
-            .into_iter()
-            .find(|entry| entry.id == "session-test")
-            .expect("saved session should be listed");
-        assert_eq!(found.message_count, 1);
-        assert_eq!(found.model.as_deref(), Some("claude-home"));
-        assert_eq!(found.last_prompt.as_deref(), Some("persist me"));
-
-        fs::remove_file(file).ok();
-        if let Some(previous_home) = previous_home {
-            std::env::set_var("HOME", previous_home);
-        }
-        fs::remove_dir_all(temp).ok();
-    }
 
     #[test]
     fn defaults_to_repl_when_no_args() {
@@ -2726,6 +2508,10 @@ mod tests {
             parse_args(&["logout".to_string()]).expect("logout should parse"),
             CliAction::Logout
         );
+        assert_eq!(
+            parse_args(&["init".to_string()]).expect("init should parse"),
+            CliAction::Init
+        );
     }
 
     #[test]
@@ -2797,8 +2583,7 @@ mod tests {
         assert!(help.contains("/permissions [read-only|workspace-write|danger-full-access]"));
         assert!(help.contains("/clear [--confirm]"));
         assert!(help.contains("/cost"));
-        assert!(help.contains("/resume <session-id-or-path>"));
+        assert!(help.contains("/resume <session-path>"));
-        assert!(help.contains("/sessions"));
         assert!(help.contains("/config [env|hooks|model]"));
         assert!(help.contains("/memory"));
         assert!(help.contains("/init"));
@@ -2881,12 +2666,11 @@ mod tests {
     }
 
     #[test]
-    fn init_report_uses_structured_output() {
+    fn init_help_mentions_direct_subcommand() {
-        let created = format_init_report(Path::new("/tmp/CLAUDE.md"), true);
+        let mut help = Vec::new();
-        assert!(created.contains("Init"));
+        print_help_to(&mut help).expect("help should render");
-        assert!(created.contains("Result           created"));
+        let help = String::from_utf8(help).expect("help should be utf8");
-        let skipped = format_init_report(Path::new("/tmp/CLAUDE.md"), false);
+        assert!(help.contains("rusty-claude-cli init"));
-        assert!(skipped.contains("skipped (already exists)"));
     }
 
     #[test]
@@ -2990,7 +2774,7 @@ mod tests {
     fn status_context_reads_real_workspace_metadata() {
         let context = status_context(None).expect("status context should load");
         assert!(context.cwd.is_absolute());
-        assert!(context.discovered_config_files >= 3);
+        assert_eq!(context.discovered_config_files, 5);
         assert!(context.loaded_config_files <= context.discovered_config_files);
     }
 
@@ -3048,7 +2832,7 @@ mod tests {
 
     #[test]
     fn init_template_mentions_detected_rust_workspace() {
-        let rendered = render_init_claude_md(Path::new("."));
+        let rendered = crate::init::render_init_claude_md(std::path::Path::new("."));
         assert!(rendered.contains("# CLAUDE.md"));
         assert!(rendered.contains("cargo clippy --workspace --all-targets -- -D warnings"));
     }