@lamentis/naome 1.1.2 → 1.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Cargo.lock +2 -2
- package/Cargo.toml +1 -1
- package/LICENSE +180 -21
- package/README.md +49 -6
- package/bin/naome-node.js +2 -1579
- package/bin/naome.js +68 -16
- package/crates/naome-cli/Cargo.toml +1 -1
- package/crates/naome-cli/src/check_commands.rs +135 -0
- package/crates/naome-cli/src/cli_args.rs +5 -0
- package/crates/naome-cli/src/dispatcher.rs +37 -0
- package/crates/naome-cli/src/install_bridge.rs +83 -0
- package/crates/naome-cli/src/main.rs +60 -341
- package/crates/naome-cli/src/prompt_commands.rs +68 -0
- package/crates/naome-cli/src/quality_commands.rs +229 -0
- package/crates/naome-cli/src/simple_commands.rs +53 -0
- package/crates/naome-cli/src/workflow_commands.rs +153 -0
- package/crates/naome-core/Cargo.toml +1 -1
- package/crates/naome-core/src/decision/checks.rs +64 -0
- package/crates/naome-core/src/decision/idle.rs +67 -0
- package/crates/naome-core/src/decision/json.rs +36 -0
- package/crates/naome-core/src/decision/states.rs +165 -0
- package/crates/naome-core/src/decision.rs +131 -353
- package/crates/naome-core/src/harness_health/integrity.rs +96 -0
- package/crates/naome-core/src/harness_health.rs +14 -126
- package/crates/naome-core/src/install_plan.rs +5 -0
- package/crates/naome-core/src/intent/classifier.rs +171 -0
- package/crates/naome-core/src/intent/envelope.rs +108 -0
- package/crates/naome-core/src/intent/legacy.rs +138 -0
- package/crates/naome-core/src/intent/legacy_response.rs +76 -0
- package/crates/naome-core/src/intent/model.rs +71 -0
- package/crates/naome-core/src/intent/patterns.rs +170 -0
- package/crates/naome-core/src/intent/resolver.rs +162 -0
- package/crates/naome-core/src/intent/resolver_active.rs +17 -0
- package/crates/naome-core/src/intent/resolver_baseline.rs +55 -0
- package/crates/naome-core/src/intent/resolver_catalog.rs +167 -0
- package/crates/naome-core/src/intent/resolver_policy.rs +72 -0
- package/crates/naome-core/src/intent/resolver_shared.rs +55 -0
- package/crates/naome-core/src/intent/risk.rs +40 -0
- package/crates/naome-core/src/intent/segment.rs +170 -0
- package/crates/naome-core/src/intent.rs +64 -879
- package/crates/naome-core/src/journal.rs +9 -20
- package/crates/naome-core/src/lib.rs +15 -0
- package/crates/naome-core/src/paths.rs +3 -1
- package/crates/naome-core/src/quality/adapter_support.rs +89 -0
- package/crates/naome-core/src/quality/adapters.rs +131 -0
- package/crates/naome-core/src/quality/baseline.rs +75 -0
- package/crates/naome-core/src/quality/checks/duplicate_blocks.rs +175 -0
- package/crates/naome-core/src/quality/checks/near_duplicates.rs +130 -0
- package/crates/naome-core/src/quality/checks.rs +228 -0
- package/crates/naome-core/src/quality/cleanup.rs +84 -0
- package/crates/naome-core/src/quality/config.rs +102 -0
- package/crates/naome-core/src/quality/config_support.rs +24 -0
- package/crates/naome-core/src/quality/mod.rs +108 -0
- package/crates/naome-core/src/quality/scanner/repo_paths.rs +103 -0
- package/crates/naome-core/src/quality/scanner.rs +379 -0
- package/crates/naome-core/src/quality/structure/adapters.rs +84 -0
- package/crates/naome-core/src/quality/structure/checks/basic.rs +153 -0
- package/crates/naome-core/src/quality/structure/checks/directory.rs +144 -0
- package/crates/naome-core/src/quality/structure/checks/pairing.rs +63 -0
- package/crates/naome-core/src/quality/structure/checks.rs +124 -0
- package/crates/naome-core/src/quality/structure/classify/roles.rs +188 -0
- package/crates/naome-core/src/quality/structure/classify.rs +94 -0
- package/crates/naome-core/src/quality/structure/config.rs +89 -0
- package/crates/naome-core/src/quality/structure/defaults.rs +107 -0
- package/crates/naome-core/src/quality/structure/mod.rs +77 -0
- package/crates/naome-core/src/quality/structure/model.rs +124 -0
- package/crates/naome-core/src/quality/types.rs +292 -0
- package/crates/naome-core/src/route/builtin_checks.rs +155 -0
- package/crates/naome-core/src/route/builtin_context.rs +73 -0
- package/crates/naome-core/src/route/builtin_integrity.rs +49 -0
- package/crates/naome-core/src/route/builtin_require.rs +40 -0
- package/crates/naome-core/src/route/context.rs +180 -0
- package/crates/naome-core/src/route/execution.rs +96 -0
- package/crates/naome-core/src/route/execution_baselines.rs +146 -0
- package/crates/naome-core/src/route/execution_support.rs +57 -0
- package/crates/naome-core/src/route/execution_tasks.rs +71 -0
- package/crates/naome-core/src/route/git_ops.rs +72 -0
- package/crates/naome-core/src/route/quality_gate.rs +73 -0
- package/crates/naome-core/src/route/quality_gate_config.rs +126 -0
- package/crates/naome-core/src/route/quality_gate_snapshot.rs +69 -0
- package/crates/naome-core/src/route/worktree.rs +75 -0
- package/crates/naome-core/src/route/worktree_files.rs +32 -0
- package/crates/naome-core/src/route/worktree_plan.rs +131 -0
- package/crates/naome-core/src/route.rs +44 -1155
- package/crates/naome-core/src/task_state/admission.rs +63 -0
- package/crates/naome-core/src/task_state/admission_proof.rs +72 -0
- package/crates/naome-core/src/task_state/api.rs +130 -0
- package/crates/naome-core/src/task_state/commit_gate.rs +138 -0
- package/crates/naome-core/src/task_state/compact_proof.rs +160 -0
- package/crates/naome-core/src/task_state/completed_refresh.rs +89 -0
- package/crates/naome-core/src/task_state/completion.rs +72 -0
- package/crates/naome-core/src/task_state/deleted_paths.rs +47 -0
- package/crates/naome-core/src/task_state/diff.rs +95 -0
- package/crates/naome-core/src/task_state/evidence.rs +154 -0
- package/crates/naome-core/src/task_state/git_io.rs +86 -0
- package/crates/naome-core/src/task_state/git_parse.rs +86 -0
- package/crates/naome-core/src/task_state/git_refs.rs +37 -0
- package/crates/naome-core/src/task_state/human_review_state.rs +31 -0
- package/crates/naome-core/src/task_state/mod.rs +38 -0
- package/crates/naome-core/src/task_state/process_guard.rs +40 -0
- package/crates/naome-core/src/task_state/progress.rs +123 -0
- package/crates/naome-core/src/task_state/proof.rs +139 -0
- package/crates/naome-core/src/task_state/proof_entry.rs +66 -0
- package/crates/naome-core/src/task_state/proof_model.rs +70 -0
- package/crates/naome-core/src/task_state/proof_sources.rs +76 -0
- package/crates/naome-core/src/task_state/push_gate.rs +49 -0
- package/crates/naome-core/src/task_state/reconcile.rs +7 -0
- package/crates/naome-core/src/task_state/repair.rs +168 -0
- package/crates/naome-core/src/task_state/shape.rs +117 -0
- package/crates/naome-core/src/task_state/task_diff_api.rs +170 -0
- package/crates/naome-core/src/task_state/task_records.rs +131 -0
- package/crates/naome-core/src/task_state/task_references.rs +126 -0
- package/crates/naome-core/src/task_state/types.rs +87 -0
- package/crates/naome-core/src/task_state/util.rs +137 -0
- package/crates/naome-core/src/verification/render.rs +122 -0
- package/crates/naome-core/src/verification.rs +177 -58
- package/crates/naome-core/src/verification_contract.rs +49 -21
- package/crates/naome-core/src/workflow/integrity.rs +123 -0
- package/crates/naome-core/src/workflow/integrity_normalize.rs +7 -0
- package/crates/naome-core/src/workflow/integrity_support.rs +110 -0
- package/crates/naome-core/src/workflow/mod.rs +18 -0
- package/crates/naome-core/src/workflow/mutation.rs +68 -0
- package/crates/naome-core/src/workflow/output.rs +111 -0
- package/crates/naome-core/src/workflow/phase_inference.rs +73 -0
- package/crates/naome-core/src/workflow/phases.rs +169 -0
- package/crates/naome-core/src/workflow/policy.rs +156 -0
- package/crates/naome-core/src/workflow/processes.rs +91 -0
- package/crates/naome-core/src/workflow/types.rs +42 -0
- package/crates/naome-core/tests/decision.rs +24 -118
- package/crates/naome-core/tests/harness_health.rs +5 -0
- package/crates/naome-core/tests/intent.rs +97 -792
- package/crates/naome-core/tests/intent_support/mod.rs +133 -0
- package/crates/naome-core/tests/intent_v2.rs +90 -0
- package/crates/naome-core/tests/quality.rs +319 -0
- package/crates/naome-core/tests/quality_structure.rs +116 -0
- package/crates/naome-core/tests/quality_structure_adapters.rs +98 -0
- package/crates/naome-core/tests/quality_structure_policy.rs +125 -0
- package/crates/naome-core/tests/quality_structure_support/mod.rs +249 -0
- package/crates/naome-core/tests/repo_support/mod.rs +16 -0
- package/crates/naome-core/tests/repo_support/repo.rs +113 -0
- package/crates/naome-core/tests/repo_support/repo_factories.rs +99 -0
- package/crates/naome-core/tests/repo_support/repo_helpers.rs +123 -0
- package/crates/naome-core/tests/repo_support/routes.rs +81 -0
- package/crates/naome-core/tests/repo_support/verification.rs +168 -0
- package/crates/naome-core/tests/repo_support/verification_values.rs +135 -0
- package/crates/naome-core/tests/route.rs +1 -1476
- package/crates/naome-core/tests/route_baseline.rs +86 -0
- package/crates/naome-core/tests/route_completion.rs +141 -0
- package/crates/naome-core/tests/route_harness_refresh.rs +135 -0
- package/crates/naome-core/tests/route_user_diff.rs +198 -0
- package/crates/naome-core/tests/route_worktree.rs +54 -0
- package/crates/naome-core/tests/task_state.rs +60 -429
- package/crates/naome-core/tests/task_state_compact.rs +110 -0
- package/crates/naome-core/tests/task_state_compact_support/mod.rs +5 -0
- package/crates/naome-core/tests/task_state_compact_support/repo.rs +130 -0
- package/crates/naome-core/tests/task_state_compact_support/states.rs +151 -0
- package/crates/naome-core/tests/task_state_support/mod.rs +163 -0
- package/crates/naome-core/tests/task_state_support/states.rs +84 -0
- package/crates/naome-core/tests/verification.rs +4 -45
- package/crates/naome-core/tests/verification_contract.rs +22 -78
- package/crates/naome-core/tests/workflow_integrity.rs +85 -0
- package/crates/naome-core/tests/workflow_policy.rs +139 -0
- package/crates/naome-core/tests/workflow_support/mod.rs +194 -0
- package/installer/agents.js +90 -0
- package/installer/context.js +67 -0
- package/installer/filesystem.js +166 -0
- package/installer/flows.js +84 -0
- package/installer/git-boundary.js +170 -0
- package/installer/git-hook-content.js +36 -0
- package/installer/git-hooks.js +134 -0
- package/installer/git-local.js +2 -0
- package/installer/git-shared.js +35 -0
- package/installer/harness-file-ops.js +140 -0
- package/installer/harness-files.js +56 -0
- package/installer/harness-verification.js +123 -0
- package/installer/install-plan.js +66 -0
- package/installer/main.js +25 -0
- package/installer/manifest-state.js +167 -0
- package/installer/native-build.js +24 -0
- package/installer/native-format.js +6 -0
- package/installer/native.js +162 -0
- package/installer/output.js +131 -0
- package/installer/version.js +32 -0
- package/native/darwin-arm64/naome +0 -0
- package/native/linux-x64/naome +0 -0
- package/package.json +3 -2
- package/templates/naome-root/.naome/bin/check-harness-health.js +66 -85
- package/templates/naome-root/.naome/bin/check-task-state.js +9 -10
- package/templates/naome-root/.naome/bin/naome.js +51 -76
- package/templates/naome-root/.naome/manifest.json +22 -18
- package/templates/naome-root/.naome/repository-quality-baseline.json +5 -0
- package/templates/naome-root/.naome/repository-quality.json +24 -0
- package/templates/naome-root/.naome/repository-structure.json +90 -0
- package/templates/naome-root/.naome/task-contract.schema.json +93 -11
- package/templates/naome-root/.naome/upgrade-state.json +1 -1
- package/templates/naome-root/.naome/verification.json +38 -0
- package/templates/naome-root/AGENTS.md +3 -0
- package/templates/naome-root/docs/naome/agent-workflow.md +25 -12
- package/templates/naome-root/docs/naome/execution.md +25 -21
- package/templates/naome-root/docs/naome/index.md +5 -3
- package/templates/naome-root/docs/naome/repository-quality.md +46 -0
- package/templates/naome-root/docs/naome/repository-structure.md +51 -0
- package/templates/naome-root/docs/naome/testing.md +13 -0
- package/crates/naome-core/src/task_state.rs +0 -2210
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
use std::fs;
|
|
2
|
+
use std::path::Path;
|
|
3
|
+
|
|
4
|
+
use crate::install_plan::{LOCAL_NATIVE_BINARY_PATHS, LOCAL_ONLY_MACHINE_OWNED_PATHS};
|
|
5
|
+
use crate::models::NaomeError;
|
|
6
|
+
|
|
7
|
+
pub(super) fn copy_local_harness_files(
|
|
8
|
+
source_root: &Path,
|
|
9
|
+
worktree_root: &Path,
|
|
10
|
+
) -> Result<(), NaomeError> {
|
|
11
|
+
let mut paths = Vec::new();
|
|
12
|
+
paths.extend_from_slice(LOCAL_ONLY_MACHINE_OWNED_PATHS);
|
|
13
|
+
paths.extend_from_slice(LOCAL_NATIVE_BINARY_PATHS);
|
|
14
|
+
|
|
15
|
+
for relative_path in paths {
|
|
16
|
+
if relative_path == ".naome/archive" || relative_path == ".naome/task-journal.jsonl" {
|
|
17
|
+
continue;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
let source = source_root.join(relative_path);
|
|
21
|
+
if !source.is_file() {
|
|
22
|
+
continue;
|
|
23
|
+
}
|
|
24
|
+
let destination = worktree_root.join(relative_path);
|
|
25
|
+
if let Some(parent) = destination.parent() {
|
|
26
|
+
fs::create_dir_all(parent)?;
|
|
27
|
+
}
|
|
28
|
+
fs::copy(&source, &destination)?;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
Ok(())
|
|
32
|
+
}
|
|
@@ -0,0 +1,131 @@
|
|
|
1
|
+
use std::fs;
|
|
2
|
+
use std::path::{Path, PathBuf};
|
|
3
|
+
use std::process::Command;
|
|
4
|
+
|
|
5
|
+
use crate::models::NaomeError;
|
|
6
|
+
use crate::route::{
|
|
7
|
+
git_ops::{command_output, git_output},
|
|
8
|
+
MAX_NAOME_TASK_WORKTREES,
|
|
9
|
+
};
|
|
10
|
+
|
|
11
|
+
pub(super) struct WorktreePlan {
|
|
12
|
+
pub(super) base: PathBuf,
|
|
13
|
+
pub(super) slug: String,
|
|
14
|
+
pub(super) short_head: String,
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
pub(super) struct WorktreeCandidate {
|
|
18
|
+
pub(super) path: PathBuf,
|
|
19
|
+
pub(super) branch: String,
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
pub(super) fn worktree_plan(
|
|
23
|
+
root: &Path,
|
|
24
|
+
prompt: &str,
|
|
25
|
+
name_head: &str,
|
|
26
|
+
) -> Result<WorktreePlan, NaomeError> {
|
|
27
|
+
let common_git_dir = git_common_dir(root)?;
|
|
28
|
+
let base = common_git_dir.join("naome").join("worktrees");
|
|
29
|
+
fs::create_dir_all(&base)?;
|
|
30
|
+
let worktree_count = existing_naome_task_worktree_count(&base)?;
|
|
31
|
+
if worktree_count >= MAX_NAOME_TASK_WORKTREES {
|
|
32
|
+
return Err(NaomeError::new(format!(
|
|
33
|
+
"Too many NAOME task worktrees are present ({worktree_count}). Finish or remove old task worktrees before creating another isolated task worktree."
|
|
34
|
+
)));
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
Ok(WorktreePlan {
|
|
38
|
+
base,
|
|
39
|
+
slug: prompt_slug(prompt),
|
|
40
|
+
short_head: name_head.chars().take(12).collect(),
|
|
41
|
+
})
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
pub(super) fn available_worktree_candidates(
|
|
45
|
+
root: &Path,
|
|
46
|
+
plan: &WorktreePlan,
|
|
47
|
+
) -> Result<Vec<WorktreeCandidate>, NaomeError> {
|
|
48
|
+
let mut candidates = Vec::new();
|
|
49
|
+
for attempt in 1..100 {
|
|
50
|
+
let suffix = if attempt == 1 {
|
|
51
|
+
String::new()
|
|
52
|
+
} else {
|
|
53
|
+
format!("-{attempt}")
|
|
54
|
+
};
|
|
55
|
+
let name = format!("{}-{}{}", plan.slug, plan.short_head, suffix);
|
|
56
|
+
let branch = format!("naome/task/{name}");
|
|
57
|
+
let path = plan.base.join(&name);
|
|
58
|
+
if !path.exists() && !git_branch_exists(root, &branch)? {
|
|
59
|
+
candidates.push(WorktreeCandidate { path, branch });
|
|
60
|
+
return Ok(candidates);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
Err(NaomeError::new(
|
|
65
|
+
"Cannot create a unique NAOME task worktree after 99 attempts.",
|
|
66
|
+
))
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
fn existing_naome_task_worktree_count(worktree_base: &Path) -> Result<usize, NaomeError> {
|
|
70
|
+
let mut count = 0;
|
|
71
|
+
for entry in fs::read_dir(worktree_base)? {
|
|
72
|
+
let entry = entry?;
|
|
73
|
+
if entry.file_type()?.is_dir() {
|
|
74
|
+
count += 1;
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
Ok(count)
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
fn git_common_dir(root: &Path) -> Result<PathBuf, NaomeError> {
|
|
81
|
+
let output = git_output(root, &["rev-parse", "--git-common-dir"])?;
|
|
82
|
+
if !output.status.success() {
|
|
83
|
+
return Err(NaomeError::new(command_output(&output)));
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
let value = String::from_utf8_lossy(&output.stdout).trim().to_string();
|
|
87
|
+
let path = PathBuf::from(value);
|
|
88
|
+
if path.is_absolute() {
|
|
89
|
+
Ok(path)
|
|
90
|
+
} else {
|
|
91
|
+
Ok(root.join(path))
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
fn git_branch_exists(root: &Path, branch: &str) -> Result<bool, NaomeError> {
|
|
96
|
+
let ref_name = format!("refs/heads/{branch}");
|
|
97
|
+
let output = Command::new("git")
|
|
98
|
+
.args(["show-ref", "--verify", "--quiet", &ref_name])
|
|
99
|
+
.current_dir(root)
|
|
100
|
+
.output()?;
|
|
101
|
+
match output.status.code() {
|
|
102
|
+
Some(0) => Ok(true),
|
|
103
|
+
Some(1) => Ok(false),
|
|
104
|
+
_ => Err(NaomeError::new(command_output(&output))),
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
fn prompt_slug(prompt: &str) -> String {
|
|
109
|
+
let mut slug = String::new();
|
|
110
|
+
let mut previous_dash = false;
|
|
111
|
+
for character in prompt.chars().flat_map(char::to_lowercase) {
|
|
112
|
+
if character.is_ascii_alphanumeric() {
|
|
113
|
+
slug.push(character);
|
|
114
|
+
previous_dash = false;
|
|
115
|
+
} else if !previous_dash && !slug.is_empty() {
|
|
116
|
+
slug.push('-');
|
|
117
|
+
previous_dash = true;
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
if slug.len() >= 40 {
|
|
121
|
+
break;
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
let slug = slug.trim_matches('-').to_string();
|
|
126
|
+
if slug.is_empty() {
|
|
127
|
+
"task".to_string()
|
|
128
|
+
} else {
|
|
129
|
+
slug
|
|
130
|
+
}
|
|
131
|
+
}
|