@lamentis/naome 1.3.0 → 1.3.2
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/README.md +11 -2
- package/bin/naome.js +62 -24
- package/crates/naome-cli/Cargo.toml +1 -1
- package/crates/naome-cli/src/context_commands.rs +47 -0
- package/crates/naome-cli/src/dispatcher.rs +6 -0
- package/crates/naome-cli/src/main.rs +43 -6
- package/crates/naome-cli/src/quality_commands.rs +31 -46
- package/crates/naome-cli/src/quality_output.rs +34 -0
- package/crates/naome-cli/src/quality_reconcile_command.rs +45 -0
- package/crates/naome-cli/src/repository_model_commands.rs +84 -0
- package/crates/naome-cli/src/task_commands.rs +62 -0
- package/crates/naome-cli/src/workflow_commands.rs +100 -3
- package/crates/naome-core/Cargo.toml +1 -1
- package/crates/naome-core/src/context/helpers.rs +75 -0
- package/crates/naome-core/src/context/select.rs +134 -0
- package/crates/naome-core/src/context/types.rs +43 -0
- package/crates/naome-core/src/context.rs +6 -0
- package/crates/naome-core/src/decision/states.rs +1 -1
- package/crates/naome-core/src/decision.rs +4 -1
- package/crates/naome-core/src/install_plan.rs +18 -0
- package/crates/naome-core/src/intent/resolver_catalog/active.rs +38 -0
- package/crates/naome-core/src/intent/resolver_catalog/baseline.rs +44 -0
- package/crates/naome-core/src/intent/resolver_catalog/completed.rs +56 -0
- package/crates/naome-core/src/intent/resolver_catalog/dirty.rs +32 -0
- package/crates/naome-core/src/intent/resolver_catalog/ready.rs +32 -0
- package/crates/naome-core/src/intent/resolver_catalog/system.rs +20 -0
- package/crates/naome-core/src/intent/resolver_catalog.rs +12 -166
- package/crates/naome-core/src/journal.rs +2 -7
- package/crates/naome-core/src/lib.rs +33 -10
- package/crates/naome-core/src/quality/adapter_ios.rs +131 -0
- package/crates/naome-core/src/quality/adapter_support.rs +67 -0
- package/crates/naome-core/src/quality/adapters.rs +81 -18
- package/crates/naome-core/src/quality/cache.rs +7 -9
- package/crates/naome-core/src/quality/checks/duplicate_blocks.rs +4 -7
- package/crates/naome-core/src/quality/config.rs +21 -3
- package/crates/naome-core/src/quality/mod.rs +138 -7
- package/crates/naome-core/src/quality/reconcile.rs +138 -0
- package/crates/naome-core/src/quality/reconcile_anchors.rs +64 -0
- package/crates/naome-core/src/quality/scanner/analysis.rs +20 -5
- package/crates/naome-core/src/quality/scanner.rs +62 -17
- package/crates/naome-core/src/quality/semantic/checks.rs +17 -0
- package/crates/naome-core/src/quality/semantic/route.rs +1 -1
- package/crates/naome-core/src/quality/structure/adapter_ios.rs +149 -0
- package/crates/naome-core/src/quality/structure/adapters.rs +60 -42
- package/crates/naome-core/src/quality/structure/checks/directory.rs +6 -4
- package/crates/naome-core/src/quality/structure/classify/roles.rs +51 -5
- package/crates/naome-core/src/quality/structure/config.rs +24 -3
- package/crates/naome-core/src/quality/structure/mod.rs +3 -0
- package/crates/naome-core/src/quality/types.rs +20 -1
- package/crates/naome-core/src/repository_model/detect.rs +188 -0
- package/crates/naome-core/src/repository_model/explain.rs +121 -0
- package/crates/naome-core/src/repository_model/path_scan.rs +67 -0
- package/crates/naome-core/src/repository_model/path_support.rs +59 -0
- package/crates/naome-core/src/repository_model/types.rs +152 -0
- package/crates/naome-core/src/repository_model/world.rs +48 -0
- package/crates/naome-core/src/repository_model/world_adapters.rs +145 -0
- package/crates/naome-core/src/repository_model/world_path_facts.rs +55 -0
- package/crates/naome-core/src/repository_model/world_paths.rs +168 -0
- package/crates/naome-core/src/repository_model.rs +164 -0
- package/crates/naome-core/src/route/builtin_checks.rs +40 -1
- package/crates/naome-core/src/task_ledger/import.rs +142 -0
- package/crates/naome-core/src/task_ledger/model.rs +13 -0
- package/crates/naome-core/src/task_ledger/proof_record.rs +52 -0
- package/crates/naome-core/src/task_ledger/read.rs +118 -0
- package/crates/naome-core/src/task_ledger/render.rs +55 -0
- package/crates/naome-core/src/task_ledger/write.rs +38 -0
- package/crates/naome-core/src/task_ledger.rs +48 -0
- package/crates/naome-core/src/task_state/api.rs +4 -2
- package/crates/naome-core/src/task_state/completed_refresh.rs +5 -16
- package/crates/naome-core/src/task_state/diff.rs +2 -2
- package/crates/naome-core/src/task_state/evidence.rs +8 -3
- package/crates/naome-core/src/task_state/mod.rs +1 -1
- package/crates/naome-core/src/task_state/progress.rs +13 -0
- package/crates/naome-core/src/task_state/proof_model.rs +8 -8
- package/crates/naome-core/src/task_state/repair.rs +2 -2
- package/crates/naome-core/src/task_state/task_diff_api.rs +9 -18
- package/crates/naome-core/src/task_state/types.rs +24 -0
- package/crates/naome-core/src/verification.rs +29 -18
- package/crates/naome-core/src/workflow/agent/capability.rs +194 -0
- package/crates/naome-core/src/workflow/agent/context_delta.rs +42 -0
- package/crates/naome-core/src/workflow/agent/decision.rs +32 -0
- package/crates/naome-core/src/workflow/agent/execution.rs +80 -0
- package/crates/naome-core/src/workflow/agent/proof.rs +24 -0
- package/crates/naome-core/src/workflow/agent/support.rs +58 -0
- package/crates/naome-core/src/workflow/agent/watchdog.rs +47 -0
- package/crates/naome-core/src/workflow/agent.rs +34 -0
- package/crates/naome-core/src/workflow/agent_types.rs +105 -0
- package/crates/naome-core/src/workflow/doctor.rs +39 -0
- package/crates/naome-core/src/workflow/mod.rs +11 -0
- package/crates/naome-core/src/workflow/output.rs +8 -2
- package/crates/naome-core/src/workflow/phase_inference.rs +1 -1
- package/crates/naome-core/tests/context.rs +99 -0
- package/crates/naome-core/tests/harness_health.rs +33 -40
- package/crates/naome-core/tests/install_plan.rs +12 -0
- package/crates/naome-core/tests/quality.rs +178 -2
- package/crates/naome-core/tests/quality_performance.rs +39 -2
- package/crates/naome-core/tests/quality_structure_adapters.rs +39 -0
- package/crates/naome-core/tests/repo_support/mod.rs +7 -1
- package/crates/naome-core/tests/repo_support/verification_values.rs +148 -1
- package/crates/naome-core/tests/repository_model.rs +281 -0
- package/crates/naome-core/tests/route_user_diff.rs +49 -1
- package/crates/naome-core/tests/semantic_legacy.rs +72 -38
- package/crates/naome-core/tests/task_ledger.rs +328 -0
- package/crates/naome-core/tests/task_state.rs +34 -14
- package/crates/naome-core/tests/task_state_support/mod.rs +2 -1
- package/crates/naome-core/tests/task_state_support/states.rs +28 -11
- package/crates/naome-core/tests/verification.rs +14 -39
- package/crates/naome-core/tests/verification_contract.rs +6 -52
- package/crates/naome-core/tests/workflow_agent.rs +233 -0
- package/crates/naome-core/tests/workflow_agent_support/mod.rs +159 -0
- package/crates/naome-core/tests/workflow_doctor.rs +21 -0
- package/crates/naome-core/tests/workflow_integrity.rs +2 -20
- package/crates/naome-core/tests/workflow_support/mod.rs +59 -20
- package/installer/codex-hooks.js +121 -0
- package/installer/context.js +10 -0
- package/installer/filesystem.js +4 -0
- package/installer/flows.js +8 -4
- package/installer/harness-files.js +6 -0
- package/installer/install-plan.js +4 -0
- package/installer/main.js +1 -1
- package/installer/native.js +1 -1
- package/native/darwin-arm64/naome +0 -0
- package/native/linux-x64/naome +0 -0
- package/package.json +1 -1
- package/templates/naome-root/.codex/config.toml +2 -0
- package/templates/naome-root/.codex/hooks.json +70 -0
- package/templates/naome-root/.naome/bin/check-harness-health.js +8 -6
- package/templates/naome-root/.naome/bin/check-task-state.js +12 -7
- package/templates/naome-root/.naome/bin/codex-hook-io.js +122 -0
- package/templates/naome-root/.naome/bin/codex-hook-policy.js +180 -0
- package/templates/naome-root/.naome/bin/codex-hook-runtime.js +174 -0
- package/templates/naome-root/.naome/bin/codex-hook.js +6 -0
- package/templates/naome-root/.naome/bin/naome.js +35 -4
- package/templates/naome-root/.naome/manifest.json +12 -6
- package/templates/naome-root/.naome/repository-model.json +6 -0
- package/templates/naome-root/.naome/repository-quality.json +3 -1
- package/templates/naome-root/.naome/verification.json +15 -1
- package/templates/naome-root/AGENTS.md +38 -83
- package/templates/naome-root/docs/naome/agent-workflow.md +54 -18
- package/templates/naome-root/docs/naome/codex-hooks.md +82 -0
- package/templates/naome-root/docs/naome/context-economy.md +73 -0
- package/templates/naome-root/docs/naome/first-run.md +25 -14
- package/templates/naome-root/docs/naome/index.md +18 -10
- package/templates/naome-root/docs/naome/repository-model.md +92 -0
- package/templates/naome-root/docs/naome/repository-quality.md +47 -7
- package/templates/naome-root/docs/naome/repository-structure.md +10 -3
- package/templates/naome-root/docs/naome/task-ledger.md +71 -0
- package/templates/naome-root/docs/naome/testing.md +16 -3
|
@@ -0,0 +1,152 @@
|
|
|
1
|
+
use serde::{Deserialize, Serialize};
|
|
2
|
+
|
|
3
|
+
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
|
4
|
+
#[serde(rename_all = "camelCase")]
|
|
5
|
+
pub struct RepositoryModel {
|
|
6
|
+
pub schema: String,
|
|
7
|
+
pub version: u32,
|
|
8
|
+
pub status: String,
|
|
9
|
+
pub facts: Vec<RepositoryFact>,
|
|
10
|
+
#[serde(default, skip_serializing_if = "Vec::is_empty")]
|
|
11
|
+
pub languages: Vec<RepositoryWorldSignal>,
|
|
12
|
+
#[serde(default, skip_serializing_if = "Vec::is_empty")]
|
|
13
|
+
pub package_managers: Vec<RepositoryWorldSignal>,
|
|
14
|
+
#[serde(default, skip_serializing_if = "Vec::is_empty")]
|
|
15
|
+
pub build_systems: Vec<RepositoryWorldSignal>,
|
|
16
|
+
#[serde(default, skip_serializing_if = "Vec::is_empty")]
|
|
17
|
+
pub adapters: Vec<RepositoryWorldSignal>,
|
|
18
|
+
#[serde(default, skip_serializing_if = "Vec::is_empty")]
|
|
19
|
+
pub roots: Vec<RepositoryRoot>,
|
|
20
|
+
#[serde(default, skip_serializing_if = "Vec::is_empty")]
|
|
21
|
+
pub entities: Vec<RepositoryEntity>,
|
|
22
|
+
#[serde(default, skip_serializing_if = "Vec::is_empty")]
|
|
23
|
+
pub path_facts: Vec<RepositoryPathFact>,
|
|
24
|
+
#[serde(default, skip_serializing_if = "Vec::is_empty")]
|
|
25
|
+
pub verification_checks: Vec<RepositoryVerificationCheck>,
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
|
29
|
+
#[serde(rename_all = "camelCase")]
|
|
30
|
+
pub struct RepositoryFact {
|
|
31
|
+
pub id: String,
|
|
32
|
+
pub category: String,
|
|
33
|
+
pub value: String,
|
|
34
|
+
pub confidence: String,
|
|
35
|
+
pub source: String,
|
|
36
|
+
pub evidence: Vec<String>,
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
|
40
|
+
#[serde(rename_all = "camelCase")]
|
|
41
|
+
pub struct RepositoryWorldSignal {
|
|
42
|
+
pub id: String,
|
|
43
|
+
pub value: String,
|
|
44
|
+
pub confidence: String,
|
|
45
|
+
pub source: String,
|
|
46
|
+
pub evidence: Vec<String>,
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
|
50
|
+
#[serde(rename_all = "camelCase")]
|
|
51
|
+
pub struct RepositoryRoot {
|
|
52
|
+
pub id: String,
|
|
53
|
+
pub role: String,
|
|
54
|
+
pub path: String,
|
|
55
|
+
pub source: String,
|
|
56
|
+
pub evidence: Vec<String>,
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
|
60
|
+
#[serde(rename_all = "camelCase")]
|
|
61
|
+
pub struct RepositoryEntity {
|
|
62
|
+
pub id: String,
|
|
63
|
+
pub kind: String,
|
|
64
|
+
pub name: String,
|
|
65
|
+
pub path: String,
|
|
66
|
+
pub languages: Vec<String>,
|
|
67
|
+
pub roots: Vec<String>,
|
|
68
|
+
pub source: String,
|
|
69
|
+
pub evidence: Vec<String>,
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
|
73
|
+
#[serde(rename_all = "camelCase")]
|
|
74
|
+
pub struct RepositoryPathFact {
|
|
75
|
+
pub path: String,
|
|
76
|
+
pub role: String,
|
|
77
|
+
#[serde(skip_serializing_if = "Option::is_none")]
|
|
78
|
+
pub module: Option<String>,
|
|
79
|
+
#[serde(skip_serializing_if = "Option::is_none")]
|
|
80
|
+
pub entity: Option<String>,
|
|
81
|
+
#[serde(skip_serializing_if = "Option::is_none")]
|
|
82
|
+
pub language: Option<String>,
|
|
83
|
+
#[serde(default, skip_serializing_if = "Vec::is_empty")]
|
|
84
|
+
pub flags: Vec<String>,
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
|
88
|
+
#[serde(rename_all = "camelCase")]
|
|
89
|
+
pub struct RepositoryVerificationCheck {
|
|
90
|
+
pub id: String,
|
|
91
|
+
pub command: String,
|
|
92
|
+
pub cwd: String,
|
|
93
|
+
pub evidence: Vec<String>,
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
#[derive(Debug, Clone, Serialize)]
|
|
97
|
+
#[serde(rename_all = "camelCase")]
|
|
98
|
+
pub struct RepositoryModelRefresh {
|
|
99
|
+
pub schema: String,
|
|
100
|
+
pub ok: bool,
|
|
101
|
+
pub stale: bool,
|
|
102
|
+
pub write: bool,
|
|
103
|
+
pub model_path: String,
|
|
104
|
+
pub updated_paths: Vec<String>,
|
|
105
|
+
pub reason_codes: Vec<String>,
|
|
106
|
+
pub model: RepositoryModel,
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
#[derive(Debug, Clone, Serialize)]
|
|
110
|
+
#[serde(rename_all = "camelCase")]
|
|
111
|
+
pub struct RepositoryModelDrift {
|
|
112
|
+
pub schema: String,
|
|
113
|
+
pub ok: bool,
|
|
114
|
+
pub model_present: bool,
|
|
115
|
+
pub stale: bool,
|
|
116
|
+
pub model_path: String,
|
|
117
|
+
pub reason_codes: Vec<String>,
|
|
118
|
+
pub related_paths: Vec<String>,
|
|
119
|
+
pub messages: Vec<String>,
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
#[derive(Debug, Clone, Serialize)]
|
|
123
|
+
#[serde(rename_all = "camelCase")]
|
|
124
|
+
pub struct RepositoryPathExplanation {
|
|
125
|
+
pub schema: String,
|
|
126
|
+
pub path: String,
|
|
127
|
+
pub role: Option<String>,
|
|
128
|
+
pub language: Option<String>,
|
|
129
|
+
pub module: Option<String>,
|
|
130
|
+
pub entity: Option<String>,
|
|
131
|
+
pub facts: Vec<RepositoryFact>,
|
|
132
|
+
pub evidence: Vec<String>,
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
impl Default for RepositoryModel {
|
|
136
|
+
fn default() -> Self {
|
|
137
|
+
Self {
|
|
138
|
+
schema: "naome.repository-model.v1".to_string(),
|
|
139
|
+
version: 1,
|
|
140
|
+
status: "ready".to_string(),
|
|
141
|
+
facts: Vec::new(),
|
|
142
|
+
languages: Vec::new(),
|
|
143
|
+
package_managers: Vec::new(),
|
|
144
|
+
build_systems: Vec::new(),
|
|
145
|
+
adapters: Vec::new(),
|
|
146
|
+
roots: Vec::new(),
|
|
147
|
+
entities: Vec::new(),
|
|
148
|
+
path_facts: Vec::new(),
|
|
149
|
+
verification_checks: Vec::new(),
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
use super::types::{
|
|
2
|
+
RepositoryEntity, RepositoryFact, RepositoryPathFact, RepositoryRoot, RepositoryWorldSignal,
|
|
3
|
+
};
|
|
4
|
+
use super::world_adapters::detect_adapter_signals;
|
|
5
|
+
use super::world_path_facts::detect_path_facts;
|
|
6
|
+
use super::world_paths::{detect_entities, detect_roots};
|
|
7
|
+
|
|
8
|
+
pub(super) struct RepositoryWorldSections {
|
|
9
|
+
pub languages: Vec<RepositoryWorldSignal>,
|
|
10
|
+
pub package_managers: Vec<RepositoryWorldSignal>,
|
|
11
|
+
pub build_systems: Vec<RepositoryWorldSignal>,
|
|
12
|
+
pub adapters: Vec<RepositoryWorldSignal>,
|
|
13
|
+
pub roots: Vec<RepositoryRoot>,
|
|
14
|
+
pub entities: Vec<RepositoryEntity>,
|
|
15
|
+
pub path_facts: Vec<RepositoryPathFact>,
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
pub(super) fn build_world_sections(
|
|
19
|
+
paths: &[String],
|
|
20
|
+
facts: &[RepositoryFact],
|
|
21
|
+
) -> RepositoryWorldSections {
|
|
22
|
+
let roots = detect_roots(paths);
|
|
23
|
+
let entities = detect_entities(paths);
|
|
24
|
+
let path_facts = detect_path_facts(paths, &roots, &entities);
|
|
25
|
+
RepositoryWorldSections {
|
|
26
|
+
languages: signals_from_facts(facts, "language"),
|
|
27
|
+
package_managers: signals_from_facts(facts, "packageManager"),
|
|
28
|
+
build_systems: signals_from_facts(facts, "buildSystem"),
|
|
29
|
+
adapters: detect_adapter_signals(paths),
|
|
30
|
+
roots,
|
|
31
|
+
entities,
|
|
32
|
+
path_facts,
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
fn signals_from_facts(facts: &[RepositoryFact], category: &str) -> Vec<RepositoryWorldSignal> {
|
|
37
|
+
facts
|
|
38
|
+
.iter()
|
|
39
|
+
.filter(|fact| fact.category == category)
|
|
40
|
+
.map(|fact| RepositoryWorldSignal {
|
|
41
|
+
id: fact.value.clone(),
|
|
42
|
+
value: fact.value.clone(),
|
|
43
|
+
confidence: fact.confidence.clone(),
|
|
44
|
+
source: fact.source.clone(),
|
|
45
|
+
evidence: fact.evidence.clone(),
|
|
46
|
+
})
|
|
47
|
+
.collect()
|
|
48
|
+
}
|
|
@@ -0,0 +1,145 @@
|
|
|
1
|
+
use super::path_scan::{evidence, has_any_suffix, has_path, has_suffix};
|
|
2
|
+
use super::types::RepositoryWorldSignal;
|
|
3
|
+
|
|
4
|
+
pub(super) fn detect_adapter_signals(paths: &[String]) -> Vec<RepositoryWorldSignal> {
|
|
5
|
+
let mut signals = adapter_specs(paths)
|
|
6
|
+
.into_iter()
|
|
7
|
+
.filter(|(_, detected, evidence)| *detected && !evidence.is_empty())
|
|
8
|
+
.map(|(id, _, evidence)| RepositoryWorldSignal {
|
|
9
|
+
id: id.to_string(),
|
|
10
|
+
value: id.to_string(),
|
|
11
|
+
confidence: "high".to_string(),
|
|
12
|
+
source: "deterministic-scan".to_string(),
|
|
13
|
+
evidence,
|
|
14
|
+
})
|
|
15
|
+
.collect::<Vec<_>>();
|
|
16
|
+
signals.sort_by(|left, right| left.id.cmp(&right.id));
|
|
17
|
+
signals
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
fn adapter_specs(paths: &[String]) -> Vec<(&'static str, bool, Vec<String>)> {
|
|
21
|
+
vec![
|
|
22
|
+
(
|
|
23
|
+
"rust",
|
|
24
|
+
detects_rust(paths),
|
|
25
|
+
evidence(paths, &["Cargo.toml", ".rs"]),
|
|
26
|
+
),
|
|
27
|
+
(
|
|
28
|
+
"javascript-typescript",
|
|
29
|
+
detects_javascript_typescript(paths),
|
|
30
|
+
evidence(paths, &["package.json", ".js", ".ts", ".tsx", ".jsx"]),
|
|
31
|
+
),
|
|
32
|
+
(
|
|
33
|
+
"swift",
|
|
34
|
+
detects_swift(paths),
|
|
35
|
+
evidence(paths, &["Package.swift", ".swift"]),
|
|
36
|
+
),
|
|
37
|
+
(
|
|
38
|
+
"xcode",
|
|
39
|
+
paths
|
|
40
|
+
.iter()
|
|
41
|
+
.any(|path| path.contains(".xcodeproj/") || path.contains(".xcworkspace/")),
|
|
42
|
+
evidence(paths, &[".xcodeproj/", ".xcworkspace/"]),
|
|
43
|
+
),
|
|
44
|
+
(
|
|
45
|
+
"xctest",
|
|
46
|
+
detects_xctest(paths),
|
|
47
|
+
evidence(paths, &["Tests", ".swift"]),
|
|
48
|
+
),
|
|
49
|
+
(
|
|
50
|
+
"swiftui",
|
|
51
|
+
detects_swiftui(paths),
|
|
52
|
+
evidence(paths, &["View.swift", "App.swift"]),
|
|
53
|
+
),
|
|
54
|
+
(
|
|
55
|
+
"ios-app-structure",
|
|
56
|
+
detects_ios_app(paths),
|
|
57
|
+
evidence(paths, &["Info.plist", ".xcassets/"]),
|
|
58
|
+
),
|
|
59
|
+
(
|
|
60
|
+
"swift-package",
|
|
61
|
+
detects_swift_package(paths),
|
|
62
|
+
evidence(paths, &["Package.swift", "Sources/"]),
|
|
63
|
+
),
|
|
64
|
+
(
|
|
65
|
+
"ios-resources",
|
|
66
|
+
detects_ios_resources(paths),
|
|
67
|
+
evidence(paths, &[".strings", ".plist", ".xib"]),
|
|
68
|
+
),
|
|
69
|
+
(
|
|
70
|
+
"generated-ios",
|
|
71
|
+
detects_generated_ios(paths),
|
|
72
|
+
evidence(paths, &["Generated/", ".generated.swift"]),
|
|
73
|
+
),
|
|
74
|
+
]
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
fn detects_rust(paths: &[String]) -> bool {
|
|
78
|
+
has_path(paths, "Cargo.toml") || has_suffix(paths, ".rs")
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
fn detects_javascript_typescript(paths: &[String]) -> bool {
|
|
82
|
+
has_path(paths, "package.json") || has_any_suffix(paths, &[".js", ".jsx", ".ts", ".tsx"])
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
fn detects_swift(paths: &[String]) -> bool {
|
|
86
|
+
has_path(paths, "Package.swift") || has_suffix(paths, ".swift")
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
fn detects_xctest(paths: &[String]) -> bool {
|
|
90
|
+
paths.iter().any(|path| {
|
|
91
|
+
let lower = path.to_ascii_lowercase();
|
|
92
|
+
lower.contains("/tests/") && lower.ends_with("tests.swift")
|
|
93
|
+
})
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
fn detects_swiftui(paths: &[String]) -> bool {
|
|
97
|
+
paths.iter().any(|path| {
|
|
98
|
+
let lower = path.to_ascii_lowercase();
|
|
99
|
+
lower.ends_with("view.swift")
|
|
100
|
+
|| lower.ends_with("app.swift")
|
|
101
|
+
|| lower.contains("preview content/")
|
|
102
|
+
})
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
fn detects_ios_app(paths: &[String]) -> bool {
|
|
106
|
+
paths.iter().any(|path| {
|
|
107
|
+
let lower = path.to_ascii_lowercase();
|
|
108
|
+
lower.ends_with("info.plist")
|
|
109
|
+
|| lower.ends_with(".entitlements")
|
|
110
|
+
|| lower.contains(".xcassets/")
|
|
111
|
+
})
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
fn detects_swift_package(paths: &[String]) -> bool {
|
|
115
|
+
has_path(paths, "Package.swift")
|
|
116
|
+
|| paths
|
|
117
|
+
.iter()
|
|
118
|
+
.any(|path| path.starts_with("Sources/") || path.contains("/Sources/"))
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
fn detects_ios_resources(paths: &[String]) -> bool {
|
|
122
|
+
paths.iter().any(|path| {
|
|
123
|
+
has_any_suffix(
|
|
124
|
+
&[path.clone()],
|
|
125
|
+
&[
|
|
126
|
+
".strings",
|
|
127
|
+
".stringsdict",
|
|
128
|
+
".plist",
|
|
129
|
+
".entitlements",
|
|
130
|
+
".storyboard",
|
|
131
|
+
".xib",
|
|
132
|
+
],
|
|
133
|
+
) || path.to_ascii_lowercase().contains(".xcassets/")
|
|
134
|
+
})
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
fn detects_generated_ios(paths: &[String]) -> bool {
|
|
138
|
+
paths.iter().any(|path| {
|
|
139
|
+
let lower = path.to_ascii_lowercase();
|
|
140
|
+
lower.contains("/generated/")
|
|
141
|
+
|| lower.contains("/swiftgen/")
|
|
142
|
+
|| lower.contains("/sourcery/")
|
|
143
|
+
|| lower.ends_with(".generated.swift")
|
|
144
|
+
})
|
|
145
|
+
}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
use super::path_support::{
|
|
2
|
+
entity_for_path, is_package_manifest, language_for_path, module_for_path,
|
|
3
|
+
};
|
|
4
|
+
use super::types::{RepositoryEntity, RepositoryPathFact, RepositoryRoot};
|
|
5
|
+
|
|
6
|
+
pub(super) fn detect_path_facts(
|
|
7
|
+
paths: &[String],
|
|
8
|
+
roots: &[RepositoryRoot],
|
|
9
|
+
entities: &[RepositoryEntity],
|
|
10
|
+
) -> Vec<RepositoryPathFact> {
|
|
11
|
+
let mut facts = paths
|
|
12
|
+
.iter()
|
|
13
|
+
.filter(|path| is_model_evidence_path(path))
|
|
14
|
+
.map(|path| RepositoryPathFact {
|
|
15
|
+
path: path.clone(),
|
|
16
|
+
role: role_for_path(path, roots).unwrap_or_else(|| "unknown".to_string()),
|
|
17
|
+
module: module_for_path(path, roots),
|
|
18
|
+
entity: entity_for_path(path, entities),
|
|
19
|
+
language: language_for_path(path),
|
|
20
|
+
flags: flags_for_path(path),
|
|
21
|
+
})
|
|
22
|
+
.collect::<Vec<_>>();
|
|
23
|
+
facts.sort_by(|left, right| left.path.cmp(&right.path));
|
|
24
|
+
facts.dedup_by(|left, right| left.path == right.path);
|
|
25
|
+
facts
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
fn is_model_evidence_path(path: &str) -> bool {
|
|
29
|
+
is_package_manifest(path)
|
|
30
|
+
|| path.ends_with(".xcodeproj/project.pbxproj")
|
|
31
|
+
|| path.ends_with("App.swift")
|
|
32
|
+
|| path.ends_with("Info.plist")
|
|
33
|
+
|| path.ends_with(".entitlements")
|
|
34
|
+
|| path.ends_with(".xcassets/Contents.json")
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
fn role_for_path(path: &str, roots: &[RepositoryRoot]) -> Option<String> {
|
|
38
|
+
roots
|
|
39
|
+
.iter()
|
|
40
|
+
.filter(|root| path == root.path || path.starts_with(&format!("{}/", root.path)))
|
|
41
|
+
.max_by_key(|root| root.path.len())
|
|
42
|
+
.map(|root| root.role.clone())
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
fn flags_for_path(path: &str) -> Vec<String> {
|
|
46
|
+
let lower = path.to_ascii_lowercase();
|
|
47
|
+
let mut flags = Vec::new();
|
|
48
|
+
if lower.contains("/generated/") || lower.ends_with(".generated.swift") {
|
|
49
|
+
flags.push("generated".to_string());
|
|
50
|
+
}
|
|
51
|
+
if lower.contains("/build/") || lower.contains("/dist/") || lower.contains("/deriveddata/") {
|
|
52
|
+
flags.push("artifact".to_string());
|
|
53
|
+
}
|
|
54
|
+
flags
|
|
55
|
+
}
|
|
@@ -0,0 +1,168 @@
|
|
|
1
|
+
use super::path_support::{is_package_manifest, language_for_path, parent_path, root_at_segment};
|
|
2
|
+
use super::types::{RepositoryEntity, RepositoryRoot};
|
|
3
|
+
|
|
4
|
+
pub(super) fn detect_roots(paths: &[String]) -> Vec<RepositoryRoot> {
|
|
5
|
+
let mut roots = Vec::new();
|
|
6
|
+
for path in paths {
|
|
7
|
+
for (role, root) in root_candidates(path) {
|
|
8
|
+
push_root(&mut roots, role, &root);
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
for (role, defaults) in default_roots() {
|
|
12
|
+
for root in defaults {
|
|
13
|
+
if paths
|
|
14
|
+
.iter()
|
|
15
|
+
.any(|path| path == *root || path.starts_with(&format!("{root}/")))
|
|
16
|
+
{
|
|
17
|
+
push_root(&mut roots, role, root);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
roots.sort_by(|left, right| left.id.cmp(&right.id));
|
|
22
|
+
roots.dedup_by(|left, right| left.id == right.id);
|
|
23
|
+
roots
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
pub(super) fn detect_entities(paths: &[String]) -> Vec<RepositoryEntity> {
|
|
27
|
+
let mut entities = Vec::new();
|
|
28
|
+
for path in paths {
|
|
29
|
+
if is_package_manifest(path) {
|
|
30
|
+
push_entity(&mut entities, "package", &parent_path(path), path, paths);
|
|
31
|
+
}
|
|
32
|
+
if path.ends_with(".xcodeproj/project.pbxproj") {
|
|
33
|
+
push_entity(
|
|
34
|
+
&mut entities,
|
|
35
|
+
"app",
|
|
36
|
+
path.trim_end_matches("/project.pbxproj"),
|
|
37
|
+
path,
|
|
38
|
+
paths,
|
|
39
|
+
);
|
|
40
|
+
}
|
|
41
|
+
if path.ends_with("App.swift") {
|
|
42
|
+
push_entity(&mut entities, "app", &parent_path(path), path, paths);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
entities.sort_by(|left, right| left.id.cmp(&right.id));
|
|
46
|
+
entities.dedup_by(|left, right| left.id == right.id);
|
|
47
|
+
entities
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
fn root_candidates(path: &str) -> Vec<(&'static str, String)> {
|
|
51
|
+
[
|
|
52
|
+
(
|
|
53
|
+
"source",
|
|
54
|
+
root_at_segment(path, &["src", "Sources", "Source", "app"]),
|
|
55
|
+
),
|
|
56
|
+
(
|
|
57
|
+
"test",
|
|
58
|
+
root_at_segment(path, &["test", "tests", "Tests", "__tests__"]),
|
|
59
|
+
),
|
|
60
|
+
("docs", root_at_segment(path, &["docs"])),
|
|
61
|
+
(
|
|
62
|
+
"generated",
|
|
63
|
+
root_at_segment(path, &["generated", "Generated"]),
|
|
64
|
+
),
|
|
65
|
+
(
|
|
66
|
+
"artifact",
|
|
67
|
+
root_at_segment(path, &["dist", "build", "DerivedData"]),
|
|
68
|
+
),
|
|
69
|
+
]
|
|
70
|
+
.into_iter()
|
|
71
|
+
.filter_map(|(role, root)| root.map(|root| (role, root)))
|
|
72
|
+
.collect()
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
fn default_roots() -> [(&'static str, &'static [&'static str]); 5] {
|
|
76
|
+
[
|
|
77
|
+
("source", &["src", "Sources", "app", "packages"]),
|
|
78
|
+
("test", &["test", "tests", "Tests", "__tests__"]),
|
|
79
|
+
("docs", &["docs"]),
|
|
80
|
+
("generated", &["generated", "Generated"]),
|
|
81
|
+
("artifact", &["dist", "build", "DerivedData"]),
|
|
82
|
+
]
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
fn push_root(roots: &mut Vec<RepositoryRoot>, role: &str, path: &str) {
|
|
86
|
+
let normalized = path.trim_end_matches('/').to_string();
|
|
87
|
+
roots.push(RepositoryRoot {
|
|
88
|
+
id: format!("{role}:{normalized}"),
|
|
89
|
+
role: role.to_string(),
|
|
90
|
+
path: normalized.clone(),
|
|
91
|
+
source: "deterministic-scan".to_string(),
|
|
92
|
+
evidence: vec![normalized],
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
fn push_entity(
|
|
97
|
+
entities: &mut Vec<RepositoryEntity>,
|
|
98
|
+
kind: &str,
|
|
99
|
+
path: &str,
|
|
100
|
+
evidence_path: &str,
|
|
101
|
+
all_paths: &[String],
|
|
102
|
+
) {
|
|
103
|
+
let normalized = if path.is_empty() { "." } else { path };
|
|
104
|
+
let entity_paths = all_paths
|
|
105
|
+
.iter()
|
|
106
|
+
.filter(|candidate| normalized == "." || candidate.starts_with(&format!("{normalized}/")))
|
|
107
|
+
.cloned()
|
|
108
|
+
.collect::<Vec<_>>();
|
|
109
|
+
entities.push(RepositoryEntity {
|
|
110
|
+
id: format!("{kind}:{normalized}"),
|
|
111
|
+
kind: kind.to_string(),
|
|
112
|
+
name: entity_name(normalized),
|
|
113
|
+
path: normalized.to_string(),
|
|
114
|
+
languages: entity_languages(&entity_paths),
|
|
115
|
+
roots: entity_roots(normalized, &entity_paths),
|
|
116
|
+
source: "deterministic-scan".to_string(),
|
|
117
|
+
evidence: vec![evidence_path.to_string()],
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
fn entity_name(path: &str) -> String {
|
|
122
|
+
path.rsplit('/')
|
|
123
|
+
.next()
|
|
124
|
+
.filter(|name| !name.is_empty())
|
|
125
|
+
.unwrap_or("root")
|
|
126
|
+
.to_string()
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
fn entity_languages(paths: &[String]) -> Vec<String> {
|
|
130
|
+
let mut languages = paths
|
|
131
|
+
.iter()
|
|
132
|
+
.filter_map(|path| language_for_path(path))
|
|
133
|
+
.collect::<Vec<_>>();
|
|
134
|
+
languages.sort();
|
|
135
|
+
languages.dedup();
|
|
136
|
+
languages
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
fn entity_roots(entity_path: &str, paths: &[String]) -> Vec<String> {
|
|
140
|
+
let mut roots = paths
|
|
141
|
+
.iter()
|
|
142
|
+
.filter_map(|path| entity_root_path(entity_path, path))
|
|
143
|
+
.collect::<Vec<_>>();
|
|
144
|
+
roots.sort();
|
|
145
|
+
roots.dedup();
|
|
146
|
+
roots
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
fn entity_root_path(entity_path: &str, path: &str) -> Option<String> {
|
|
150
|
+
let relative = if entity_path == "." {
|
|
151
|
+
path
|
|
152
|
+
} else {
|
|
153
|
+
path.strip_prefix(&format!("{entity_path}/"))?
|
|
154
|
+
};
|
|
155
|
+
let first = relative.split('/').next()?;
|
|
156
|
+
if matches!(
|
|
157
|
+
first,
|
|
158
|
+
"src" | "Sources" | "test" | "tests" | "Tests" | "Resources"
|
|
159
|
+
) {
|
|
160
|
+
Some(if entity_path == "." {
|
|
161
|
+
first.to_string()
|
|
162
|
+
} else {
|
|
163
|
+
format!("{entity_path}/{first}")
|
|
164
|
+
})
|
|
165
|
+
} else {
|
|
166
|
+
None
|
|
167
|
+
}
|
|
168
|
+
}
|