localcode 0.3.11__tar.gz → 0.3.13__tar.gz

{localcode-0.3.11/src/localcode.egg-info → localcode-0.3.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localcode
-Version: 0.3.11
+Version: 0.3.13
 Summary: High-performance AI coding on consumer hardware.
 Author: LocalCode contributors
 License-Expression: Apache-2.0

{localcode-0.3.11 → localcode-0.3.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "localcode"
-version = "0.3.11"
+version = "0.3.13"
 description = "High-performance AI coding on consumer hardware."
 readme = "README.md"
 requires-python = ">=3.10"

{localcode-0.3.11 → localcode-0.3.13}/src/localcode/__init__.py

@@ -1,3 +1,3 @@
 __all__ = ["__version__"]
 
-__version__ = "0.3.11"
+__version__ = "0.3.13"

{localcode-0.3.11 → localcode-0.3.13}/src/localcode/agent/context.py

@@ -729,12 +729,24 @@ def build_progress_ledger(
         "not your progress or your task). Don't re-read/re-run anything below "
         "unless you changed it; keep making NEW progress toward the user's goal.",
     ]
-    rd = _uniq(files_read)
-    if rd:
-        lines.append("Files read: " + ", ".join(rd[-12:]))
+    # Files created/edited is the most important line (it's "where I am" in a
+    # multi-file build) — list it FIRST and show ALL of them, not just the last
+    # 12. Capping at 12 dropped the earliest files once a build exceeded 12,
+    # so the model re-checked what existed and felt like it restarted. Paths are
+    # short; the whole list is cheap and is the anchor that prevents forgetting.
     cf = _uniq(changed_files)
+    # The created/edited list is PROTECTED — never truncated by the budget.
+    # It's the anchor that stops the model forgetting what it built; losing any
+    # of it is what caused the "restarting" feeling. Everything ELSE (files
+    # read, commands) shares the remaining budget and can be trimmed.
+    protected = []
     if cf:
-        lines.append("Files created/edited: " + ", ".join(cf[-12:]))
+        protected.append(f"Files YOU already created/edited this task ({len(cf)}) — "
+                         "do NOT recreate or re-check these, build on them: " + ", ".join(cf))
+    optional = []
+    rd = _uniq(files_read)
+    if rd:
+        optional.append("Files read: " + ", ".join(rd[-12:]))
     if bash_history:
         cmds: list[str] = []
         for cmd, res in bash_history[-8:]:
@@ -747,11 +759,64 @@ def build_progress_ledger(
                         if str(cmd).strip() else "")
         cmds = [c for c in cmds if c]
         if cmds:
-            lines.append("Commands run: " + " | ".join(cmds))
-    text = "\n".join(lines)
-    if budget_chars and len(text) > budget_chars:
-        text = text[: max(0, budget_chars - 2)].rstrip() + " …"
-    return text
+            optional.append("Commands run: " + " | ".join(cmds))
+
+    head = "\n".join(lines + protected)
+    if not optional:
+        return head
+    extra = "\n".join(optional)
+    if budget_chars and len(head) + 1 + len(extra) > budget_chars:
+        room = max(0, budget_chars - len(head) - 3)
+        extra = extra[:room].rstrip() + " …" if room > 0 else ""
+    return head + ("\n" + extra if extra else "")
+
+
+def build_filesystem_state(changed_files: list[str], max_files: int = 80) -> str:
+    """Ground-truth 'what's actually on disk' for the project being built.
+
+    The #1 fix for the model re-checking which files exist and re-creating
+    them (pi/codex/opencode all converge on this): don't rely on the model's
+    recollection — reconcile against the FILESYSTEM in code, each round. We
+    walk the tree rooted at the project the model is building (the common
+    parent of the files it has changed) and list the real source files. Because
+    the truth comes from the OS, it survives compaction/restart and the model
+    can't hallucinate it away. Returns "" when nothing has been built yet.
+    """
+    import os
+    roots = [os.path.dirname(f) for f in changed_files if f]
+    if not roots:
+        return ""
+    # Project root = shortest existing common-ish ancestor of changed files.
+    try:
+        root = os.path.commonpath([os.path.abspath(os.path.dirname(f))
+                                   for f in changed_files if f])
+    except Exception:
+        root = os.path.abspath(roots[0])
+    if not os.path.isdir(root):
+        return ""
+    _SKIP = {".git", "node_modules", "dist", "build", ".venv", "__pycache__", ".next"}
+    _SRC = (".ts", ".tsx", ".js", ".jsx", ".py", ".css", ".scss", ".html", ".json",
+            ".md", ".go", ".rs", ".java", ".rb", ".php", ".vue", ".svelte", ".toml", ".yaml", ".yml")
+    found: list[str] = []
+    for base, dirs, files in os.walk(root):
+        dirs[:] = [d for d in dirs if d not in _SKIP]
+        for fn in files:
+            if fn.endswith(_SRC):
+                rel = os.path.relpath(os.path.join(base, fn), root)
+                found.append(rel)
+                if len(found) >= max_files:
+                    break
+        if len(found) >= max_files:
+            break
+    if not found:
+        return ""
+    found.sort()
+    return (
+        f"## Files that ALREADY EXIST on disk in this project ({os.path.basename(root)}/) "
+        f"— ground truth, {len(found)} file(s). Do NOT list the directory to check; "
+        "do NOT recreate these. Edit an existing file or create a NEW one the task needs:\n"
+        + ", ".join(found)
+    )
 
 
 def _estimate_tokens(messages: list[dict]) -> int:

{localcode-0.3.11 → localcode-0.3.13}/src/localcode/agent/loop.py

@@ -726,10 +726,20 @@ def run_agent_loop(
                 _todo_note = render_todo_reminder(list(getattr(app.session, "todos", []) or []))
             except Exception:
                 _todo_note = ""
-            # Inject ledger + todo as ONE trailing SYSTEM message (not role:user
-            # — as a user turn the model re-greeted every round). Ephemeral.
+            # Filesystem reconciliation (pi/codex/opencode pattern): the actual
+            # files on disk, scanned in CODE each round. Ground truth the model
+            # can't forget or hallucinate — kills the "re-check what exists /
+            # restart" loop that memory-based tracking couldn't.
+            _fs_state = ""
             try:
-                _ctx_block = "\n\n".join(b for b in (_ledger, _todo_note) if b)
+                from .context import build_filesystem_state
+                _fs_state = build_filesystem_state(changed_files)
+            except Exception:
+                _fs_state = ""
+            # Inject ledger + fs-state + todo as ONE trailing SYSTEM message (not
+            # role:user — as a user turn the model re-greeted every round). Ephemeral.
+            try:
+                _ctx_block = "\n\n".join(b for b in (_ledger, _fs_state, _todo_note) if b)
                 if _ctx_block:
                     model_messages = list(model_messages) + [
                         {"role": "system", "content": _ctx_block}

{localcode-0.3.11 → localcode-0.3.13}/src/localcode/agent/prompts.py

@@ -170,11 +170,12 @@ def model_identity_line(model: str) -> str:
         f"the user already knows who you are and what the task is. Just continue "
         f"the work: take the next action directly. Only state your name if the "
         f"user explicitly asks who you are. "
-        f"The model currently powering you is \"{friendly}\"; report it as EXACTLY "
-        f"\"{friendly}\" — and only — when the user specifically asks which "
-        f"model / version / quant you are, or asks to name something (a file, "
-        f"folder, project) after your model. When asked, never say you are unsure "
-        f"and never name a different model or provider.\n"
+        f"The model currently powering you is \"{friendly}\". Report it as EXACTLY "
+        f"\"{friendly}\" when the user asks which model/version/quant you are. And "
+        f"when the task asks you to name a file/folder/project after your model "
+        f"(e.g. a path like `.../[insert your model name]`), USE \"{friendly}\" as "
+        f"that name and create it — do NOT skip it or substitute 'LocalCode'. Never "
+        f"say you are unsure and never name a different model or provider.\n"
     )
 
 

{localcode-0.3.11 → localcode-0.3.13}/src/localcode/runtime.py

@@ -1125,6 +1125,14 @@ class LocalCodeRuntimeGateway(_DiffusionMixin):
             # CREATES this round, while leaving legitimate prompt-side
             # repetition (paths, function names, identifiers) untouched.
             "dry_penalty_last_n": dry_penalty_last_n,
+            # Sequence breakers RESET DRY's n-gram matching at these tokens, so
+            # a repeated file PATH / identifier isn't treated as a penalizable
+            # loop. Without them (llama.cpp's default breakers don't include
+            # path chars), a path repeated within one round — `cd X && mkdir X
+            # && ls X` — got its username subtokens suppressed and the model
+            # emitted mangled variants (`marcsolomon` → `marcolon`). Breaking on
+            # `/ . _ - space` keeps DRY for phrasal loops but frees paths/idents.
+            "dry_sequence_breakers": ["\n", "/", ".", "_", "-", " ", ":", "\"", "'"],
         }
         if self.config.mode == "fast":
             opts["num_predict"] = 4096  # cap generation for speed
@@ -2098,6 +2106,8 @@ class LocalCodeRuntimeGateway(_DiffusionMixin):
                 payload["dry_base"] = opts["dry_base"]
                 payload["dry_allowed_length"] = opts["dry_allowed_length"]
                 payload["dry_penalty_last_n"] = opts["dry_penalty_last_n"]
+                if opts.get("dry_sequence_breakers"):
+                    payload["dry_sequence_breakers"] = opts["dry_sequence_breakers"]
                 if opts.get("min_p", 0):
                     payload["min_p"] = opts["min_p"]
             if "num_predict" in opts:

{localcode-0.3.11 → localcode-0.3.13}/src/localcode/tools/bash.py

@@ -698,17 +698,48 @@ def _normalize_repo_root_variants(cmd: str, repo: str) -> str:
     run with `cwd=repo`, so absolute paths are unnecessary; when they do
     appear and clearly target this repo, normalize them to the actual root
     instead of letting the command fail for a fake home-directory variant.
+    Then a general pass repairs ANY `/Users/<garbled>/` (not just repo paths)
+    back to the real home — the model mangles the username via penalty-induced
+    token corruption (`marcsolomon` → `marcolon`/`marcslomon`), a DIFFERENT
+    misspelling each time, so it can't be dedup'd; we fix it deterministically.
     """
     if not repo.startswith("/Users/"):
-        return cmd
+        return _repair_home_username(cmd)
     parts = repo.strip("/").split("/")
     if len(parts) < 3:
-        return cmd
+        return _repair_home_username(cmd)
     stable_tail = "/".join(parts[2:])
     pattern = re.compile(
         rf"/Users/[^/\s'\"]+/{re.escape(stable_tail)}(?=(?:/|\s|['\"]|$))"
     )
-    return pattern.sub(repo, cmd)
+    return _repair_home_username(pattern.sub(repo, cmd))
+
+
+def _repair_home_username(cmd: str) -> str:
+    """Fix `/Users/<wrong>/…` → `/Users/<real>/…` using the actual home dir.
+
+    localcode knows the real username; any `/Users/<name>/` where <name> is not
+    the real one AND not another existing home directory is a corruption — swap
+    in the real username so the command targets the file the model meant.
+    """
+    import os as _os
+    home = _os.path.expanduser("~")
+    if not home.startswith("/Users/"):
+        return cmd
+    real_user = home.split("/")[2]
+    if not real_user:
+        return cmd
+
+    def _sub(m):
+        name = m.group(1)
+        if name == real_user:
+            return m.group(0)
+        # Leave real, existing OTHER home dirs alone (multi-user machines).
+        if _os.path.isdir(f"/Users/{name}"):
+            return m.group(0)
+        return f"/Users/{real_user}/"
+
+    return re.sub(r"/Users/([^/\s'\"]+)/", _sub, cmd)
 
 
 def _quoting_error_hint(output: str) -> str:

{localcode-0.3.11 → localcode-0.3.13/src/localcode.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localcode
-Version: 0.3.11
+Version: 0.3.13
 Summary: High-performance AI coding on consumer hardware.
 Author: LocalCode contributors
 License-Expression: Apache-2.0

{localcode-0.3.11 → localcode-0.3.13}/tests/test_context.py

@@ -185,7 +185,11 @@ def test_progress_ledger_budget_is_ram_tiered():
     assert progress_ledger_budget_chars(98304) == 1600    # 48 GB / 96K
     assert progress_ledger_budget_chars(131072) == 2200   # 64 GB / 128K
     assert progress_ledger_budget_chars(262144) == 3500   # 128 GB / 256K: rich
-    # Budget actually trims.
+    # Budget trims the OPTIONAL content (files-read / commands), but the
+    # created/edited list is PROTECTED — never dropped, since it's the anchor
+    # that stops the model forgetting what it built. So a long read/command
+    # payload gets trimmed while the created file stays.
     from localcode.agent.context import build_progress_ledger
-    big = build_progress_ledger(["f"], [("c" * 300, "ok")], ["p" * 300], 100)
-    assert len(big) <= 102
+    big = build_progress_ledger(["kept.py"], [("c" * 300, "ok")], ["p" * 300], 100)
+    assert "kept.py" in big                       # created file never dropped
+    assert "cccc" not in big or "…" in big        # long command payload trimmed