codent 0.3.4__tar.gz → 0.3.6__tar.gz

{codent-0.3.4 → codent-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codent
-Version: 0.3.4
+Version: 0.3.6
 Requires-Python: >=3.10
 Requires-Dist: rich>=13.0
 Requires-Dist: openai>=1.0

{codent-0.3.4 → codent-0.3.6}/codent.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codent
-Version: 0.3.4
+Version: 0.3.6
 Requires-Python: >=3.10
 Requires-Dist: rich>=13.0
 Requires-Dist: openai>=1.0

{codent-0.3.4 → codent-0.3.6}/core/context_utils.py

@@ -1,3 +1,6 @@
+import os
+
+from core.tool_helpers import _classify_llm_error
 
 
 # Additional extractions from runtime.py

{codent-0.3.4 → codent-0.3.6}/core/identity.py

@@ -447,93 +447,19 @@ def get_current_state() -> dict:
     return {"_fresh": False}
 
 def get_startup_context() -> str:
-    """Build startup context string for system prompt."""
-    context_parts = []
-
-    # 1. Location awareness
+    """Build minimal per-turn startup context (location only).
+
+    ADIM 2: Memory/learning/automation stats kaldırıldı.
+    Bunlar on-demand:
+      - Hafıza → memory_gate proaktif inject
+      - Recipes/vocabulary → recall tool
+      - Automations → list_automations tool
+      - Live state → where_am_i tool
+    """
     cont_home = get_cont_home()
     cwd = Path.cwd()
-
-    context_parts.append(f"""
-## Current Location
-- My home: {cont_home}
-- Current working directory: {cwd}
-- In my home: {cwd.resolve() == cont_home.resolve()}
-""")
-
-    # 2. Current state (if watcher is running)
-    state = get_current_state()
-    if state:
-        context_parts.append("## Live System State")
-
-        if "recent_files" in state:
-            recent = state["recent_files"][:5]
-            if recent:
-                context_parts.append("Recent file changes:")
-                for f in recent:
-                    context_parts.append(f"  - {f.get('action', '?')}: {f.get('path', '?')} ({f.get('time', '?')})")
-
-        if "recent_commands" in state:
-            recent = state["recent_commands"][:5]
-            if recent:
-                context_parts.append("Recent commands:")
-                for c in recent:
-                    context_parts.append(f"  - {c.get('cmd', '?')} ({c.get('time', '?')})")
-
-        if "git_status" in state:
-            git = state["git_status"]
-            context_parts.append(f"Git: branch={git.get('branch', '?')}, uncommitted={git.get('uncommitted_changes', 0)}")
-
-    # 3. Key memories (lazy import to avoid circular deps)
-    try:
-        from core.memory_store import memory_get_context
-        key_memories = memory_get_context(limit=5)
-        if key_memories:
-            context_parts.append("\n## Key Memories")
-            for mem in key_memories:
-                context_parts.append(f"- [{mem['memory_type']}] {mem['content']}")
-    except Exception:
-        pass
-
-    # 4. Learning system stats (lazy imports)
-    try:
-        from core.vocabulary import get_vocabulary_stats
-        from core.recipes import load_recipes
-        from core.prompt_patches import load_file_patches
-        learning_parts = []
-        # Vocabulary
-        vstats = get_vocabulary_stats()
-        if vstats.get("total", 0) > 0:
-            learning_parts.append(f"Vocabulary: {vstats['commands']} commands, {vstats['context_words']} context words")
-        # Recipes
-        recipes = load_recipes()
-        if recipes:
-            learning_parts.append(f"Recipes: {len(recipes)} loaded")
-        # File patches
-        patches = load_file_patches()
-        if patches:
-            active = sum(1 for p in patches if p.get("active", True))
-            learning_parts.append(f"Patches: {active} active")
-
-        if learning_parts:
-            context_parts.append("\n## Learning System")
-            for lp in learning_parts:
-                context_parts.append(f"- {lp}")
-    except Exception:
-        pass
-
-    # 5. Automation system stats (lazy import)
-    try:
-        from core.automations import load_automations
-        autos = load_automations()
-        if autos:
-            enabled = sum(1 for a in autos if a.get("enabled", True))
-            context_parts.append(f"\n## Automations")
-            context_parts.append(f"- {enabled}/{len(autos)} automations enabled")
-            enabled_names = [a["name"] for a in autos if a.get("enabled", True)]
-            if enabled_names:
-                context_parts.append(f"- Active: {', '.join(enabled_names[:5])}")
-    except Exception:
-        pass
-
-    return "\n".join(context_parts)
+    return (
+        f"## Current Location\n"
+        f"- My home: {cont_home}\n"
+        f"- CWD: {cwd}\n"
+    )

{codent-0.3.4 → codent-0.3.6}/core/init_cmd.py

@@ -109,13 +109,79 @@ def _model_exists(ollama_bin: str, model_name: str) -> bool:
         return False
 
 
+_QWEN3_CODER_TEMPLATE = '''{{- if .Messages }}
+{{- if or .System .Tools }}<|im_start|>system
+{{- if .System }}
+{{ .System }}
+{{- end }}
+{{- if .Tools }}
+
+# Tools
+
+You may call one or more functions to assist with the user query.
+
+You are provided with function signatures within <tools></tools> XML tags:
+<tools>
+{{- range .Tools }}
+{"type": "function", "function": {{ .Function }}}
+{{- end }}
+</tools>
+
+For each function call, return a json object with function name and arguments within <tool_call></tool_call> XML tags:
+<tool_call>
+{"name": <function-name>, "arguments": <args-json-object>}
+</tool_call>
+{{- end }}<|im_end|>
+{{ end }}
+{{- range $i, $_ := .Messages }}
+{{- $last := eq (len (slice $.Messages $i)) 1 -}}
+{{- if eq .Role "user" }}<|im_start|>user
+{{ .Content }}<|im_end|>
+{{ else if eq .Role "assistant" }}<|im_start|>assistant
+{{ if .Content }}{{ .Content }}
+{{- else if .ToolCalls }}<tool_call>
+{{ range .ToolCalls }}{"name": "{{ .Function.Name }}", "arguments": {{ .Function.Arguments }}}
+{{ end }}</tool_call>
+{{- end }}{{ if not $last }}<|im_end|>
+{{ end }}
+{{- else if eq .Role "tool" }}<|im_start|>user
+<tool_response>
+{{ .Content }}
+</tool_response><|im_end|>
+{{ end }}
+{{- if and (ne .Role "assistant") $last }}<|im_start|>assistant
+{{ end }}
+{{- end }}
+{{- else }}
+{{- if .System }}<|im_start|>system
+{{ .System }}<|im_end|>
+{{ end }}{{ if .Prompt }}<|im_start|>user
+{{ .Prompt }}<|im_end|>
+{{ end }}<|im_start|>assistant
+{{ end }}{{ .Response }}{{ if .Response }}<|im_end|>{{ end }}'''
+
+
+def _build_modelfile(gguf_path: Path) -> str:
+    """Qwen3-Coder tool-calling template + parameters."""
+    return (
+        f"FROM {gguf_path}\n\n"
+        f'TEMPLATE """{_QWEN3_CODER_TEMPLATE}"""\n\n'
+        'PARAMETER num_ctx 10000\n'
+        'PARAMETER temperature 0.1\n'
+        'PARAMETER stop "<|im_start|>"\n'
+        'PARAMETER stop "<|im_end|>"\n'
+        'PARAMETER stop "<|endoftext|>"\n\n'
+        'SYSTEM """You are a helpful coding assistant."""\n'
+    )
+
+
 def _create_model_from_gguf(ollama_bin: str, gguf_path: Path,
                             model_name: str = "cont-local") -> bool:
     """Generate Modelfile + run `ollama create`."""
     print(f"[*] {model_name} modeli {gguf_path.name} GGUF'undan oluşturuluyor...")
     modelfile = Path.home() / ".cache" / "cont" / "Modelfile.cont"
     modelfile.parent.mkdir(parents=True, exist_ok=True)
-    modelfile.write_text(f"FROM {gguf_path}\n", encoding="utf-8")
+    modelfile.write_text(_build_modelfile(gguf_path), encoding="utf-8")
 
     try:
         subprocess.run(

{codent-0.3.4 → codent-0.3.6}/core/prompts.py

@@ -34,95 +34,13 @@ def _get_identity_context():
         return "", "", ""
 
 EVIDENCE_RULES = """
-STRICT EVIDENCE RULES - VIOLATIONS WILL BE REJECTED:
-
-1. CITE YOUR SOURCE: Every factual claim must reference a specific tool call.
-   BAD: "The file contains a function called main()"
-   GOOD: "read_file('app.py') returned content showing line 15: 'def main():'"
-
-2. DISTINGUISH VERIFIED vs UNVERIFIED:
-   - VERIFIED: Information from tool calls THIS session
-   - UNVERIFIED: Your training knowledge (mark with "[FROM KNOWLEDGE]")
-
-3. FORBIDDEN PHRASES (will trigger verification failure):
-   - "I assume..."
-   - "Typically..."
-   - "Usually..."
-   - "The file probably..."
-   - "Standard practice suggests..."
-   - "It should have..."
-   - "Most likely..."
-
-4. MANDATORY VERIFICATION after file operations:
-   - After write_file -> read_file to confirm
-   - After run_shell -> check exit code, parse output
-   - After repo_fetch -> list_dir on returned path
-
-5. WHEN UNCERTAIN: Say "I did not verify this" or ask for clarification.
-
-6. EMPTY/ERROR RESULTS: If a tool returns empty or error:
-   - Report exactly what happened
-   - Do NOT invent alternative results
-   - Do NOT guess what "should" be there
+EVIDENCE: Tool sonucu olmadan tablo/kolon/satır/sayı iddia etme. Her iddia bu session'daki bir tool çıktısına dayanmalı. Tool boş döndüyse "boş döndü" de — alternatif uydurma. Bilmiyorsan "bilmiyorum" veya "doğrulamadım" de.
 """
 
-STRUCTURED_RESPONSE_FORMAT = """
-FORMAT YOUR FINAL RESPONSE AS:
-
-## Verified Facts
-List each fact with its source tool call:
-- [read_file('path')] Found: <exact content snippet>
-- [list_dir('path')] Contents: <actual listing>
-- [run_shell('cmd')] Exit code: X, Output: <summary>
-
-## Actions Taken
-List each action with verification:
-- [write_file('path')] Created/Modified file
-  - [VERIFIED via read_file: content matches]
-- [run_shell('cmd')] Executed command
-  - [VERIFIED: exit code 0, output shows success]
-
-## Unverified Information (if any)
-- [FROM KNOWLEDGE] <information from training, not tools>
-
-## Answer
-<Your actual response to the user>
-"""
+STRUCTURED_RESPONSE_FORMAT = ""  # ADIM 3: silindi (Cont kullanıcıya bu şablonu göstermiyordu zaten)
 
 MEMORY_INSTRUCTIONS = """
-MEMORY SYSTEM:
-You have persistent memory across conversations. Use it wisely:
-
-1. PROACTIVE REMEMBERING: When you learn something important about the user or project,
-   use the 'remember' tool immediately. Don't wait to be asked.
-   - User mentions their name, role, preferences -> remember
-   - Project details, tech stack, conventions -> remember
-   - User corrects you or gives feedback -> remember as preference
-
-2. PROACTIVE RECALL: Before making assumptions, check your memory:
-   - Starting a task? recall("project context")
-   - User asks about preferences? recall("user preference")
-   - Unsure about something discussed before? recall relevant terms
-
-3. MEMORY TYPES:
-   - fact: Objective info ("User's name is Sertan", "Project uses FastAPI")
-   - preference: Likes/dislikes ("User prefers short answers", "Dislikes verbose output")
-   - context: Situational ("Working on RAG project", "Debugging auth module")
-   - skill: Learned capabilities ("User taught me to use pytest this way")
-
-4. IMPORTANCE LEVELS:
-   - 0.9: Critical (name, key preferences, project identity)
-   - 0.7: Important (tech choices, patterns, frequent requests)
-   - 0.5: Normal (general context, one-time info)
-   - 0.3: Low (temporary context, might change)
-
-5. EXAMPLES:
-   User: "I'm Sertan and I prefer Turkish responses"
-   -> remember("User's name is Sertan", "fact", 0.9)
-   -> remember("User prefers responses in Turkish", "preference", 0.8)
-
-   User: "Show me the config"
-   -> recall("config preference") first to check if user has display preferences
+MEMORY: remember(content, type, importance) ile önemli bilgileri kaydet (importance 0.1-1.0; isim/tercih=0.9, normal=0.5). Soru gelince recall(query) ile ara. Proaktif kaydet, sorulunca hatırla.
 """
 
 ANTI_LOOP_RULES = """
@@ -203,48 +121,23 @@ You are running in WSL (Windows Subsystem for Linux). Users may give paths in va
 """
 
 CONVERSATION_CONTEXT_RULES = """
-CONVERSATION CONTEXT RULES:
-
-1. REFERENCE RESOLUTION:
-   - "that file" -> Look at previous turns, find mentioned file
-   - "search better" -> Use same target, improve search strategy
-   - "do it" -> Execute the action you suggested
-   - "there" / "that folder" -> Location from previous context
-
-2. CONTINUITY:
-   - Remember paths, files, and targets from earlier turns
-   - If user gives partial info, combine with previous context
-   - Don't ask for info that was already provided
-
-3. CONTEXT PRIORITY:
-   - Current request > Recent turns > Older turns
-   - If conflict, ask for clarification
-
-4. EXAMPLES:
-   Turn 1: "find PDF at /path/to/data"
-   Turn 2: "search in html folder too"
-   -> Combine: search /path/to/data AND /path/to/html
-
-   Turn 1: "list files in project"
-   Turn 2: "open the config one"
-   -> Find config file from Turn 1 results, open it
+CONTEXT: Kullanıcı "o dosya / şunu yap / devam et / orada" derse önceki turn'deki dosya/tool/görev referansını kullan. Daha önce verilen bilgiyi tekrar sorma.
 """
 
 QUICK_ANSWER_RULES = """
 VERİMLİLİK KURALLARI / EFFICIENCY RULES:
-1. "list dir" veya "klasörü listele" = SADECE list_dir {"path": "."} çağır ve sonucu göster. Başka tool çağırma.
-2. Basit komutlar (list, show, find, bul, göster) için MAX 2 tool call kullan.
+1. "list dir" veya "klasörü listele" / "dosyaları listele" = SADECE list_dir tool'unu çağır (path="."). İzin sorma, JSON gösterme — DİREKT ÇAĞIR.
+2. Basit komutlar (list, show, find, bul, göster, oku, aç, listele) için TEK tool çağrısı yap. Sonra cevap ver.
 3. İlk tool sonucu yeterliyse HEMEN cevap ver, ekstra arama yapma.
-4. "X loglarını aç" = system_search ile "X" + "log" ara, sonra open_file ile aç. Başka klasörlere bakma.
-5. Kullanıcı "list dir" dediğinde kosgebot/kosgeb-bot aramayacaksın. SADECE mevcut dizini listele.
-6. "X altındaki Y dosyalarını bul/listele" → ONE search_files or list_dir call, then answer.
-7. "show file" veya "dosyayı göster" → ONE read_file call, then answer.
-Do NOT over-search. If one tool call gives you the answer, STOP and respond immediately.
-
-SELF-REFERENCE SHORTCUTS (tool çağırmana gerek yok, doğrudan biliyorsun):
-- "cont log" veya "cont loglarını" = cont projesinin logs/cont_runs/ klasörü. Doğrudan open_in_explorer ile aç. Arama yapma.
-- "cont klasörü" = workspace root (yukarıda yazıyor).
-- "kendi logların" = logs/cont_runs/ altında.
+4. "show file" / "dosyayı göster" / "oku" → ONE read_file call, then answer.
+5. "X loglarını aç" = system_search ile "X" + "log" ara, sonra open_file ile aç.
+6. KULLANICIYA İZİN SORMA — kullanıcı zaten istedi. Tool'u çağır, sonucu ver.
+7. JSON tool çağrısını cevap metninde GÖSTERME — gerçekten çağır (tool_calls).
+Do NOT over-search. Do NOT ask permission. CALL the tool, return result.
+
+SELF-REFERENCE SHORTCUTS:
+- "cont log" / "cont loglarını" / "loglarım" = logs/cont_runs/. open_in_explorer ile aç.
+- "cont klasörü" / "kendin" = workspace root.
 """
 
 WORKFLOW_RULES = """
@@ -257,8 +150,30 @@ WORKFLOW:
 SAFETY: Stay inside repo root. Dangerous commands are blocked.
 """
 
+_SYSTEM_PROMPT_CACHE: dict = {}
+_SYSTEM_PROMPT_CACHE_TS: float = 0.0
+_SYSTEM_PROMPT_CACHE_TTL = 300.0  # 5 dakika
+
+
 def build_system_prompt(repo_root: str, tool_budget: int, strict_mode: bool = True) -> str:
-    """Build the complete system prompt with identity and context."""
+    """Build the complete system prompt with identity and context.
+
+    ADIM 4: 5 dakikalık TTL cache.
+    Key: (repo_root, cwd, tool_budget, strict_mode).
+    İlk çağrı I/O yapar (~700ms cold), sonrakiler <1ms.
+    """
+    import time
+    from pathlib import Path
+    global _SYSTEM_PROMPT_CACHE_TS
+
+    cache_key = (repo_root, str(Path.cwd()), tool_budget, strict_mode)
+    now = time.time()
+    if (now - _SYSTEM_PROMPT_CACHE_TS) > _SYSTEM_PROMPT_CACHE_TTL:
+        _SYSTEM_PROMPT_CACHE.clear()
+        _SYSTEM_PROMPT_CACHE_TS = now
+    cached = _SYSTEM_PROMPT_CACHE.get(cache_key)
+    if cached is not None:
+        return cached
 
     # Get identity
     try:
@@ -297,12 +212,15 @@ TOOL BUDGET: {tool_budget} calls maximum. Plan efficiently.
         base += "\n" + EVIDENCE_RULES
         base += "\n" + STRUCTURED_RESPONSE_FORMAT
 
-    base += "\n" + ANTI_LOOP_RULES
+    # ADIM 1: Duplikasyonlar silindi (runtime garantili)
+    #   ANTI_LOOP_RULES        — tool_budget + cooldown set
+    #   WRITE_PROTECTION_RULES — safety.py TIER kontrolleri
+    #   PATH_RESOLUTION_RULES  — path normalize otomatik
+    #   BASE_CAPABILITIES      — Ollama tools schema bloğu
     base += "\n" + MEMORY_INSTRUCTIONS
-    base += "\n" + WRITE_PROTECTION_RULES
-    base += "\n" + PATH_RESOLUTION_RULES
     base += "\n" + CONVERSATION_CONTEXT_RULES
     base += "\n" + QUICK_ANSWER_RULES
     base += "\n" + WORKFLOW_RULES
 
+    _SYSTEM_PROMPT_CACHE[cache_key] = base
     return base

{codent-0.3.4 → codent-0.3.6}/core/tool_helpers.py

@@ -97,9 +97,9 @@ def extract_fenced_tool_requests(text: str) -> list:
 
     # b2) <tools>...</tools> wrapper (Qwen3-Coder bare emit) — may contain
     # one or more JSON objects, possibly without closing </tools> tag.
-    if "<tools>" in text:
-        # Capture from <tools> until </tools> OR end of string
-        wrapper_match = re.search(r'<tools>\s*(.*?)(?:</tools>|$)', text, re.DOTALL)
+    # Also catches <.tools>, <tool>, <Tool>, <.tool> variants.
+    if re.search(r'<\.?tools?>', text, re.IGNORECASE):
+        wrapper_match = re.search(r'<\.?tools?>\s*(.*?)(?:</\.?tools?>|$)', text, re.DOTALL | re.IGNORECASE)
         if wrapper_match:
             inner = wrapper_match.group(1).strip()
             # Try parse as single dict, list, or multiple concatenated dicts

{codent-0.3.4 → codent-0.3.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "codent"
-version = "0.3.4"
+version = "0.3.6"
 requires-python = ">=3.10"
 dependencies = [
     "rich>=13.0",