Merge pull request #154 from TrueNine/dev

fix: restore claude workspace memory aggregation

Author: TrueNine

cli/integrate-tests/src/lib.rs

@@ -375,6 +375,20 @@ pub fn run_tnmsc_with_env(args: &[&str], cwd: &Path, envs: &[(&str, &str)]) -> C
   command_output(&mut command, "cargo run -p tnmsc --bin tnmsc")
 }
 
+pub fn run_packaged_tnmsc_with_env(
+  args: &[&str],
+  cwd: &Path,
+  envs: &[(&str, &str)],
+) -> CommandResult {
+  let mut command = Command::new(release_binary_path());
+  command.args(args).current_dir(cwd);
+  for (key, value) in envs {
+    command.env(key, value);
+  }
+
+  command_output(&mut command, "target/debug/tnmsc")
+}
+
 pub fn run_program_inherit(program: &str, args: &[&str], cwd: &Path) -> bool {
   let mut command;
   #[cfg(unix)]
@@ -574,7 +588,7 @@ pub fn pack_cli_artifacts() -> Option<PackedArtifacts> {
   let workspace_root_dir = workspace_root().to_string_lossy().into_owned();
 
   eprintln!("[tnmsc-integrate-tests] running assemble-npm...");
-  let assemble = run_tnmsc_with_env(
+  let assemble = run_packaged_tnmsc_with_env(
     &["assemble-npm", "--profile", "debug"],
     &workspace_root(),
     &[
@@ -628,7 +642,7 @@ pub fn pack_cli_artifacts() -> Option<PackedArtifacts> {
         cross_start.elapsed().as_secs_f64()
       );
 
-      let assemble_cross = run_tnmsc_with_env(
+      let assemble_cross = run_packaged_tnmsc_with_env(
         &["assemble-npm", "--profile", "debug"],
         &workspace_root(),
         &[

sdk/src/domain/output_plans/claude_code_output_plan.rs

@@ -46,20 +46,33 @@ fn build_output_files(
   let prompt_projects = get_project_prompt_output_projects(workspace);
 
   // 项目级 CLAUDE.md（根目录 + 子目录）
-  // 始终如同 AGENTS.md 一样输出项目内存内容，不与全局内存混合。
+  // 工作区根 CLAUDE.md 需要同时携带全局 memory 和工作区 prompt，
+  // 这样打包 CLI 在裸容器里安装后也能直接看到完整的 Claude 上下文。
   for project in &prompt_projects {
     let Some(project_root_dir) = resolve_project_root_dir(workspace, project) else {
       continue;
     };
 
     if let Some(root_prompt) = project.root_memory_prompt.as_ref() {
+      let content = if project.is_workspace_root_project == Some(true) {
+        merge_workspace_root_memory(
+          context
+            .global_memory
+            .as_ref()
+            .map(|prompt| prompt.content.as_str()),
+          &root_prompt.content,
+        )
+      } else {
+        root_prompt.content.clone()
+      };
+
       output_files.push(BaseOutputFileDeclarationDto {
         path: project_root_dir
           .join(CLAUDE_CODE_MEMORY_FILE)
           .to_string_lossy()
           .into_owned(),
         scope: Some(PROJECT_SCOPE.to_string()),
-        content: root_prompt.content.clone(),
+        content,
         encoding: None,
       });
     }
@@ -248,6 +261,18 @@ fn build_output_files(
   output_files
 }
 
+fn merge_workspace_root_memory(global_memory: Option<&str>, workspace_prompt: &str) -> String {
+  let global_memory = global_memory.unwrap_or("").trim();
+  let workspace_prompt = workspace_prompt.trim();
+
+  match (global_memory.is_empty(), workspace_prompt.is_empty()) {
+    (true, true) => String::new(),
+    (false, true) => global_memory.to_string(),
+    (true, false) => workspace_prompt.to_string(),
+    (false, false) => format!("{global_memory}\n\n{workspace_prompt}"),
+  }
+}
+
 fn build_rule_content(rule: &crate::domain::plugin_shared::RulePrompt) -> String {
   let Some(ref yaml_fm) = rule.yaml_front_matter else {
     return rule.content.clone();
@@ -446,6 +471,19 @@ mod tests {
     let result = wrap_yaml_front_matter(&empty, "Just content.");
     assert_eq!(result, "Just content.");
   }
+
+  #[test]
+  fn merge_workspace_root_memory_includes_global_and_workspace_content() {
+    let merged = merge_workspace_root_memory(
+      Some("Global memory from aindex"),
+      "Workspace root prompt from aindex",
+    );
+
+    assert_eq!(
+      merged,
+      "Global memory from aindex\n\nWorkspace root prompt from aindex"
+    );
+  }
 }
 
 fn build_cleanup(workspace: &Workspace) -> CleanupDeclarationsDto {