handoff-mcp-server 0.17.0 → 0.17.3

package/Cargo.lock

@@ -136,7 +136,7 @@ dependencies = [
 
 [[package]]
 name = "handoff-mcp"
-version = "0.17.0"
+version = "0.17.3"
 dependencies = [
  "anyhow",
  "chrono",

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "handoff-mcp"
-version = "0.17.0"
+version = "0.17.3"
 edition = "2021"
 description = "MCP server that gives AI coding agents persistent memory across sessions"
 license = "MIT"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "handoff-mcp-server",
-  "version": "0.17.0",
+  "version": "0.17.3",
   "description": "MCP server that gives AI coding agents persistent memory across sessions",
   "license": "MIT",
   "author": "AlphaElements <66808803+alphaelements@users.noreply.github.com>",

package/src/mcp/handlers/mod.rs

@@ -35,11 +35,16 @@ use serde_json::Value;
 use crate::mcp::types::JsonRpcResponse;
 
 pub fn resolve_project_dir(arguments: &Value) -> Result<PathBuf> {
-    let raw = match arguments.get("project_dir").and_then(|v| v.as_str()) {
+    let raw = match arguments
+        .get("project_dir")
+        .and_then(|v| v.as_str())
+        .filter(|s| !s.is_empty() && !s.starts_with("${"))
+    {
         Some(dir) => PathBuf::from(dir),
         None => std::env::current_dir().context("Failed to get current directory")?,
     };
-    std::fs::canonicalize(&raw).with_context(|| format!("Invalid project path: {}", raw.display()))
+    std::fs::canonicalize(&raw)
+        .with_context(|| format!("Invalid project path: {raw}", raw = raw.display()))
 }
 
 pub fn handle_tool_call(name: &str, arguments: &Value) -> JsonRpcResponse {

package/src/setup.rs

@@ -56,7 +56,7 @@ fn build_hooks_config() -> BTreeMap<&'static str, Value> {
         "UserPromptSubmit",
         serde_json::json!([{
             "hooks": [mcp_tool_hook(HOOK_TOOL_QUERY, serde_json::json!({
-                "project_dir": "${cwd}",
+                "project_dir": "${CLAUDE_PROJECT_DIR}",
                 "session_id": "${session_id}",
                 "text": "${prompt}"
             }))]
@@ -68,7 +68,7 @@ fn build_hooks_config() -> BTreeMap<&'static str, Value> {
         serde_json::json!([{
             "matcher": "Edit|Write|MultiEdit",
             "hooks": [mcp_tool_hook(HOOK_TOOL_QUERY, serde_json::json!({
-                "project_dir": "${cwd}",
+                "project_dir": "${CLAUDE_PROJECT_DIR}",
                 "session_id": "${session_id}",
                 "tool_name": "${tool_name}",
                 "text": "${tool_input.file_path}",
@@ -81,7 +81,7 @@ fn build_hooks_config() -> BTreeMap<&'static str, Value> {
         "SessionStart",
         serde_json::json!([{
             "hooks": [mcp_tool_hook(HOOK_TOOL_CLEANUP, serde_json::json!({
-                "project_dir": "${cwd}"
+                "project_dir": "${CLAUDE_PROJECT_DIR}"
             }))]
         }]),
     );

package/src/storage/sessions.rs

@@ -87,19 +87,34 @@ fn summary_to_slug(summary: &str) -> String {
     }
 }
 
-fn compact_timestamp(data: &SessionData) -> String {
-    let timestamp = data.ended_at.as_deref().unwrap_or("00000000-000000");
-    let ts_compact = timestamp
-        .replace(['-', ':'], "")
-        .replace('T', "-")
-        .replace('Z', "");
-    if ts_compact.len() >= 15 {
-        ts_compact[..15].to_string()
+fn extract_timestamp_from_id(id: &str) -> Option<String> {
+    // "s-20260704-003557-792065" → "20260704-003557"
+    let rest = id.strip_prefix("s-")?;
+    if rest.len() >= 15 {
+        Some(rest[..15].to_string())
     } else {
-        ts_compact
+        None
     }
 }
 
+fn compact_timestamp(data: &SessionData) -> String {
+    data.ended_at
+        .as_deref()
+        .map(|ts| {
+            let compact = ts
+                .replace(['-', ':'], "")
+                .replace('T', "-")
+                .replace('Z', "");
+            if compact.len() >= 15 {
+                compact[..15].to_string()
+            } else {
+                compact
+            }
+        })
+        .or_else(|| data.id.as_deref().and_then(extract_timestamp_from_id))
+        .unwrap_or_else(|| "00000000-000000".to_string())
+}
+
 fn synthesize_id_from_filename(filename: &str) -> String {
     // Old format: YYYYMMDD-HHMMSS-slug.status.json
     // Extract timestamp part and create s-YYYYMMDD-HHMMSS-000000
@@ -443,7 +458,7 @@ fn find_and_update_active_session(
         );
     }
 
-    if let Some((path, name, _)) = matches.into_iter().next() {
+    if let Some((path, _, _)) = matches.into_iter().next() {
         let content = std::fs::read_to_string(&path)
             .with_context(|| format!("Failed to read session: {}", path.display()))?;
         let mut data: SessionData = serde_json::from_str(&content)
@@ -457,8 +472,9 @@ fn find_and_update_active_session(
             .with_context(|| format!("Failed to write session: {}", path.display()))?;
 
         if let Some(target_status) = transition_to {
-            let target_suffix = format!(".{target_status}.json");
-            let new_name = name.replace(suffix, &target_suffix);
+            let ts_part = compact_timestamp(&data);
+            let base = generate_session_filename(&data.summary, &ts_part);
+            let new_name = format!("{base}.{target_status}.json");
             let new_path = sessions_dir.join(&new_name);
             std::fs::rename(&path, &new_path).with_context(|| {
                 format!(