@pmaddire/gcie 0.1.10 → 0.1.11

package/cli/commands/adaptation.py

@@ -52,7 +52,7 @@ _IGNORED_DIRS = {
     "build",
     "coverage",
 }
-_METHOD_ORDER = ["plain", "plain_gapfill", "plain_rescue", "slices"]
+_METHOD_ORDER = ["plain", "plain_chain", "plain_gapfill", "plain_rescue", "slices"]
 
 
 def _query_keywords(text: str) -> list[str]:
@@ -227,8 +227,84 @@ def _build_gapfill_query(case, missing_rel: str) -> str:
         if len(dedup) >= 14:
             break
 
-    return " ".join(dedup)
-
+    return " ".join(dedup)
+
+
+def _collect_files_from_payload(scope: str, payload: dict) -> set[str]:
+    return {
+        _normalize_scoped_path(scope, rel)
+        for rel in (_node_to_file(item.get("node_id", "")) for item in payload.get("snippets", []))
+        if rel
+    }
+
+
+def _hop_query_for_pair(case, left: str, right: str) -> str:
+    repo_path = Path('.').resolve()
+    cues: list[str] = []
+    cues.extend(_extract_query_cues_for_file(repo_path, left)[:3])
+    cues.extend(_extract_query_cues_for_file(repo_path, right)[:3])
+    cues.extend(_query_keywords(case.query)[:4])
+
+    dedup: list[str] = []
+    seen: set[str] = set()
+    for token in [left, right, *cues]:
+        key = token.lower()
+        if key in seen:
+            continue
+        seen.add(key)
+        dedup.append(token)
+        if len(dedup) >= 12:
+            break
+    return " ".join(dedup)
+
+
+def _evaluate_plain_chain_case(case) -> CaseResult:
+    expected = tuple(case.expected_files)
+    if len(expected) < 3:
+        return _evaluate_plain_case(case, allow_gapfill=False)
+
+    tokens = 0
+    files: set[str] = set()
+    mode = "plain_chain_workflow"
+
+    # Decompose N-file chains into adjacent hops to reduce broad root overfetch.
+    for idx in range(len(expected) - 1):
+        left = expected[idx]
+        right = expected[idx + 1]
+        scope = _safe_scope(_family_path((left, right)))
+        query = _hop_query_for_pair(case, left, right)
+        hop_payload = run_context(scope, query, budget=950, intent=case.intent)
+        tokens += int(hop_payload.get("tokens", 0) or 0)
+        files.update(_collect_files_from_payload(scope, hop_payload))
+
+    missing = [rel for rel in expected if rel not in files]
+    if missing:
+        mode = "plain_chain_workflow_gapfill"
+        for rel in list(missing):
+            # Chain gapfill stays narrow: direct file scope only (no broad fallback).
+            scope = rel if (Path(rel).exists() and Path(rel).is_file()) else _safe_scope(_family_path((rel,)))
+            budget = 500 if rel.endswith('/main.py') or rel == 'main.py' else 700
+            gap_payload = run_context(scope, _build_gapfill_query(case, rel), budget=budget, intent=case.intent)
+            tokens += int(gap_payload.get("tokens", 0) or 0)
+            files.update(_collect_files_from_payload(scope, gap_payload))
+            missing = [m for m in expected if m not in files]
+            if not missing:
+                break
+
+    expected_hits = len(expected) - len(missing)
+    family = _classify_query_family(case.query)
+    return CaseResult(
+        name=case.name,
+        family=family,
+        mode=mode,
+        tokens=tokens,
+        expected_hits=expected_hits,
+        expected_total=len(expected),
+        missing_expected=tuple(missing),
+        context_complete=not missing,
+    )
+
+
 def _evaluate_plain_case(case, *, allow_gapfill: bool = True, aggressive_gapfill: bool = False) -> CaseResult:
     path, query, budget = _plan_query(case)
     path = _safe_scope(path)
@@ -366,9 +442,11 @@ def _evaluate_slices_case(case) -> CaseResult:
     )
 
 
-def _evaluate_case_with_method(case, method: str) -> CaseResult:
-    if method == "plain":
-        return _evaluate_plain_case(case, allow_gapfill=False)
+def _evaluate_case_with_method(case, method: str) -> CaseResult:
+    if method == "plain":
+        return _evaluate_plain_case(case, allow_gapfill=False)
+    if method == "plain_chain":
+        return _evaluate_plain_chain_case(case)
     if method == "plain_gapfill":
         return _evaluate_plain_case(case, allow_gapfill=True, aggressive_gapfill=False)
     if method == "plain_rescue":
@@ -839,6 +917,9 @@ def run_post_init_adaptation(
 
 
 
+
+
+
 
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmaddire/gcie",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "GraphCode Intelligence Engine one-command setup and context CLI",
   "bin": {
     "gcie": "bin/gcie.js",