npcsh 1.0.33__py3-none-any.whl → 1.0.35__py3-none-any.whl

npcsh/_state.py

@@ -2013,6 +2013,9 @@ def execute_slash_command(command: str,
 
     return state, colored(f"Unknown slash command, jinx, or NPC: {command_name}", "red")
 
+
+
+
 def process_pipeline_command(
     cmd_segment: str,
     stdin_input: Optional[str],
@@ -2454,24 +2457,115 @@ def setup_shell() -> Tuple[CommandHistory, Team, Optional[NPC]]:
 
 
 
+                
+from npcpy.memory.memory_processor import MemoryApprovalQueue, MemoryItem, memory_approval_ui
+from npcpy.ft.memory_trainer import MemoryTrainer
+from npcpy.llm_funcs import get_facts
+
+_memory_queue = None
+
+def get_memory_queue(command_history):
+    global _memory_queue
+    if _memory_queue is None:
+        _memory_queue = MemoryApprovalQueue(command_history)
+        _memory_queue.start_background_processing()
+    return _memory_queue
+
+def format_memory_context(memory_examples):
+    if not memory_examples:
+        return ""
+    
+    context_parts = []
+    
+    approved_examples = memory_examples.get("approved", [])
+    rejected_examples = memory_examples.get("rejected", [])
+    
+    if approved_examples:
+        context_parts.append("EXAMPLES OF GOOD MEMORIES:")
+        for ex in approved_examples[:5]:
+            final = ex.get("final_memory") or ex.get("initial_memory")
+            context_parts.append(f"- {final}")
+    
+    if rejected_examples:
+        context_parts.append("\nEXAMPLES OF POOR MEMORIES TO AVOID:")
+        for ex in rejected_examples[:3]:
+            context_parts.append(f"- {ex.get('initial_memory')}")
+    
+    if context_parts:
+        context_parts.append("\nLearn from these examples to generate similar high-quality memories.")
+        return "\n".join(context_parts)
+    
+    return ""
+
+def process_memory_approvals(command_history, memory_queue):
+    pending_memories = memory_queue.get_approval_batch(max_items=5)
+    
+    if not pending_memories:
+        return
+        
+    print(f"\n🧠 Processing {len(pending_memories)} memories...")
+    
+    try:
+        trainer = MemoryTrainer()
+        auto_processed = []
+        need_human_review = []
+        
+        for memory in pending_memories:
+            result = trainer.auto_approve_memory(
+                memory['content'], 
+                memory['context'],
+                confidence_threshold=0.85
+            )
+            
+            if result['auto_processed']:
+                auto_processed.append((memory, result))
+            else:
+                need_human_review.append(memory)
+        
+        for memory, result in auto_processed:
+            command_history.update_memory_status(
+                memory['memory_id'], 
+                result['action']
+            )
+            print(f"  Auto-{result['action']}: {memory['content'][:50]}... (confidence: {result['confidence']:.2f})")
+        
+        if need_human_review:
+            approvals = memory_approval_ui(need_human_review)
+            
+            for approval in approvals:
+                command_history.update_memory_status(
+                    approval['memory_id'],
+                    approval['decision'],
+                    approval.get('final_memory')
+                )
+    
+    except Exception as e:
+        print(f"Auto-approval failed: {e}")
+        approvals = memory_approval_ui(pending_memories)
+        
+        for approval in approvals:
+            command_history.update_memory_status(
+                approval['memory_id'],
+                approval['decision'], 
+                approval.get('final_memory')
+            )
+
 def process_result(
     user_input: str,
     result_state: ShellState,
     output: Any,
-    command_history: CommandHistory, 
-
-    
+    command_history: CommandHistory,
 ):
-    
     team_name = result_state.team.name if result_state.team else "__none__"
     npc_name = result_state.npc.name if isinstance(result_state.npc, NPC) else "__none__"
     
-  
     active_npc = result_state.npc if isinstance(result_state.npc, NPC) else NPC(
         name="default", 
         model=result_state.chat_model, 
         provider=result_state.chat_provider, 
-        db_conn=command_history.engine)
+        db_conn=command_history.engine
+    )
+    
     save_conversation_message(
         command_history,
         result_state.conversation_id,
@@ -2492,23 +2586,27 @@ def process_result(
     provider_for_stream = output.get('provider', active_npc.provider) if isinstance(output, dict) else active_npc.provider
 
     print('\n')
-    if user_input =='/help':
+    if user_input == '/help':
         render_markdown(output.get('output'))
     elif result_state.stream_output:
-
-        final_output_str = print_and_process_stream_with_markdown(output_content, 
-                                                                    model_for_stream, 
-                                                                    provider_for_stream, 
-                                                                    show=True)
+        final_output_str = print_and_process_stream_with_markdown(
+            output_content, 
+            model_for_stream, 
+            provider_for_stream, 
+            show=True
+        )
     elif output_content is not None:
         final_output_str = str(output_content)
         render_markdown(final_output_str)
 
     if final_output_str:
         if result_state.messages:
-            if result_state.messages[-1].get("role") != "assistant":
-                result_state.messages.append({"role": "assistant", 
-                                          "content": final_output_str})
+            if not result_state.messages or result_state.messages[-1].get("role") != "assistant":
+                result_state.messages.append({
+                    "role": "assistant", 
+                    "content": final_output_str
+                })
+        
         save_conversation_message(
             command_history,
             result_state.conversation_id,
@@ -2524,80 +2622,154 @@ def process_result(
         conversation_turn_text = f"User: {user_input}\nAssistant: {final_output_str}"
         engine = command_history.engine
 
+        memory_examples = command_history.get_memory_examples_for_context(
+            npc=npc_name,
+            team=team_name, 
+            directory_path=result_state.current_path
+        )
+        
+        memory_context = format_memory_context(memory_examples)
+        
+        approved_facts = []
+        try:
+            facts = get_facts(
+                conversation_turn_text,
+                model=active_npc.model,
+                provider=active_npc.provider,
+                npc=active_npc,
+                context=memory_context
+            )
+            
+            if facts:
+                memories_for_approval = []
+                for i, fact in enumerate(facts):
+                    memories_for_approval.append({
+                        "memory_id": f"temp_{i}",
+                        "content": fact['statement'],
+                        "context": f"Type: {fact.get('type', 'unknown')}, Source: {fact.get('source_text', '')}",
+                        "npc": npc_name,
+                        "fact_data": fact
+                    })
+                
+                approvals = memory_approval_ui(memories_for_approval)
+                
+                for approval in approvals:
+                    fact_data = next(m['fact_data'] for m in memories_for_approval 
+                                   if m['memory_id'] == approval['memory_id'])
+                    
+                    command_history.add_memory_to_database(
+                        message_id=f"{result_state.conversation_id}_{len(result_state.messages)}",
+                        conversation_id=result_state.conversation_id,
+                        npc=npc_name,
+                        team=team_name,
+                        directory_path=result_state.current_path,
+                        initial_memory=fact_data['statement'],
+                        status=approval['decision'],
+                        model=active_npc.model,
+                        provider=active_npc.provider,
+                        final_memory=approval.get('final_memory')
+                    )
+                    
+                    if approval['decision'] in ['human-approved', 'human-edited']:
+                        approved_fact = {
+                            'statement': approval.get('final_memory') or fact_data['statement'],
+                            'source_text': fact_data.get('source_text', ''),
+                            'type': fact_data.get('type', 'explicit'),
+                            'generation': 0
+                        }
+                        approved_facts.append(approved_fact)
+                
+        except Exception as e:
+            print(colored(f"Memory generation error: {e}", "yellow"))
 
-        if result_state.build_kg:
-            import pdb 
-            pdb.set_trace()
+        if result_state.build_kg and approved_facts:
             try:
                 if not should_skip_kg_processing(user_input, final_output_str):
                     npc_kg = load_kg_from_db(engine, team_name, npc_name, result_state.current_path)
                     evolved_npc_kg, _ = kg_evolve_incremental(
                         existing_kg=npc_kg, 
-                        new_content_text=conversation_turn_text,
+                        new_facts=approved_facts,
                         model=active_npc.model, 
                         provider=active_npc.provider, 
+                        npc=active_npc,
                         get_concepts=True,
-                        link_concepts_facts = False, 
-                        link_concepts_concepts = False, 
-                        link_facts_facts = False,                         
+                        link_concepts_facts=False, 
+                        link_concepts_concepts=False, 
+                        link_facts_facts=False,                         
+                    )
+                    save_kg_to_db(
+                        engine,
+                        evolved_npc_kg, 
+                        team_name, 
+                        npc_name, 
+                        result_state.current_path
                     )
-                    save_kg_to_db(engine,
-                                evolved_npc_kg, 
-                                team_name, 
-                                npc_name, 
-                                result_state.current_path)
             except Exception as e:
                 print(colored(f"Error during real-time KG evolution: {e}", "red"))
 
-      
         result_state.turn_count += 1
 
-        if result_state.turn_count > 0 and result_state.turn_count % 10 == 0:
+        if result_state.turn_count % 10 == 0:
             print(colored("\nChecking for potential team improvements...", "cyan"))
             try:
-                summary = breathe(messages=result_state.messages[-20:], 
-                                npc=active_npc)
+                summary = breathe(messages=result_state.messages[-20:], npc=active_npc)
                 characterization = summary.get('output')
 
                 if characterization and result_state.team:
-
-                    team_ctx_path = os.path.join(result_state.team.team_path, ".ctx")
+                    team_ctx_path = get_team_ctx_path(result_state.team.team_path)
+                    if not team_ctx_path:
+                        team_ctx_path = os.path.join(result_state.team.team_path, "team.ctx")
+                    
                     ctx_data = {}
                     if os.path.exists(team_ctx_path):
                         with open(team_ctx_path, 'r') as f:
                             ctx_data = yaml.safe_load(f) or {}
+                    
                     current_context = ctx_data.get('context', '')
 
                     prompt = f"""Based on this characterization: {characterization},
-
                     suggest changes (additions, deletions, edits) to the team's context. 
                     Additions need not be fully formed sentences and can simply be equations, relationships, or other plain clear items.
                     
                     Current Context: "{current_context}". 
                     
-                    Respond with JSON: {{"suggestion": "Your sentence."
-                    }}"""
-                    response = get_llm_response(prompt, 
-                                                npc=active_npc, 
-                                                format="json")
+                    Respond with JSON: {{"suggestion": "Your sentence."}}"""
+                    
+                    response = get_llm_response(
+                        prompt, 
+                        npc=active_npc, 
+                        format="json"
+                    )
                     suggestion = response.get("response", {}).get("suggestion")
 
                     if suggestion:
                         new_context = (current_context + " " + suggestion).strip()
-                        print(colored(f"{result_state.npc.name} suggests updating team context:", "yellow"))
+                        print(colored(f"{npc_name} suggests updating team context:", "yellow"))
                         print(f"  - OLD: {current_context}\n  + NEW: {new_context}")
-                        if input("Apply? [y/N]: ").strip().lower() == 'y':
+                        
+                        choice = input("Apply? [y/N/e(dit)]: ").strip().lower()
+                        
+                        if choice == 'y':
                             ctx_data['context'] = new_context
                             with open(team_ctx_path, 'w') as f:
                                 yaml.dump(ctx_data, f)
                             print(colored("Team context updated.", "green"))
+                        elif choice == 'e':
+                            edited_context = input(f"Edit context [{new_context}]: ").strip()
+                            if edited_context:
+                                ctx_data['context'] = edited_context
+                            else:
+                                ctx_data['context'] = new_context
+                            with open(team_ctx_path, 'w') as f:
+                                yaml.dump(ctx_data, f)
+                            print(colored("Team context updated with edits.", "green"))
                         else:
                             print("Suggestion declined.")
             except Exception as e:
                 import traceback
                 print(colored(f"Could not generate team suggestions: {e}", "yellow"))
                 traceback.print_exc()
-                
+                                                
 initial_state = ShellState(
     conversation_id=start_new_conversation(),
     stream_output=NPCSH_STREAM_OUTPUT,

npcsh/alicanto.py

@@ -133,23 +133,7 @@ def load_and_combine_datasets() -> pd.DataFrame:
     except Exception as e:
         print(f"Failed to load CShorten/ML-ArXiv-Papers: {e}")
     
-    try:
-        astro_papers = load_dataset("ashishkgpian/astrorag_papers", split="train")
-        for paper in astro_papers:
-            all_papers.append({
-                'title': paper.get('title', ''),
-                'abstract': paper.get('abstract', ''),
-                'authors': paper.get('authors', []),
-                'year': paper.get('year', None),
-                'venue': paper.get('venue', ''),
-                'url': paper.get('url', ''),
-                'paperId': paper.get('id', ''),
-                'citationCount': 0,
-                'source': 'astrorag'
-            })
-    except Exception as e:
-        print(f"Failed to load ashishkgpian/astrorag_papers: {e}")
-    
+
     df = pd.DataFrame(all_papers)
     df = df.dropna(subset=['title', 'abstract'])
     df = df[df['abstract'].str.len() > 50]
@@ -172,7 +156,7 @@ def initialize_dataset_search():
 import time
 
 LAST_S2_REQUEST_TIME = 0
-S2_RATE_LIMIT_DELAY = 1.0
+S2_RATE_LIMIT_DELAY = 30
 
 def search_semantic_scholar(query: str, limit: int = 10) -> List[Dict[str, Any]]:
     global LAST_S2_REQUEST_TIME
@@ -186,8 +170,8 @@ def search_semantic_scholar(query: str, limit: int = 10) -> List[Dict[str, Any]]
     
     if time_since_last < S2_RATE_LIMIT_DELAY:
         sleep_time = S2_RATE_LIMIT_DELAY - time_since_last
-        print(f"Rate limiting: sleeping {sleep_time:.2f}s before S2 request")
-        time.sleep(sleep_time)
+        print(f"Rate limiting: still need {sleep_time:.2f}s before S2 request")
+        return None
     
     LAST_S2_REQUEST_TIME = time.time()
     
@@ -198,10 +182,11 @@ def search_semantic_scholar(query: str, limit: int = 10) -> List[Dict[str, Any]]
         "limit": limit,
         "fields": "title,abstract,authors,year,citationCount,url,tldr"
     }
-    
+    print('Semantic SCholar calls')
     try:
         response = requests.get(url, headers=headers, params=params, 
                               timeout=30)
+        print('semantic scholar response')
         response.raise_for_status()
         return response.json().get('data', [])
     except requests.exceptions.RequestException as e:
@@ -605,7 +590,7 @@ Do not use seaborn. On matplotlib plots, do not use grids or titles.
         all_actions = []
         all_outcomes = []
         
-        for micro_step in range(5):
+        for micro_step in range(11):
             print(f"\n--- Micro-step {micro_step + 1}/4 ---")
             
             if micro_step == 0:
@@ -823,20 +808,24 @@ def format_paper_as_latex(paper: Paper, authors: List[str]) -> str:
 \\end{{document}}
 """
 
-
-
 def alicanto(
     query: str,
     num_agents: int = 3,
     max_steps: int = 10,
     model: str = NPCSH_CHAT_MODEL,
     provider: str = NPCSH_CHAT_PROVIDER,
+    skip_research: bool = True,
     **kwargs
 ) -> None:
 
     print("=== ALICANTO RESEARCH SYSTEM STARTING ===")
     print(f"Query: {query}")
-    print(f"Agents: {num_agents}, Max steps per agent: {max_steps}")
+    
+    if skip_research:
+        print("SKIPPING RESEARCH - GOING DIRECTLY TO PAPER WRITING")
+    else:
+        print(f"Agents: {num_agents}, Max steps per agent: {max_steps}")
+    
     print(f"Model: {model}, Provider: {provider}")
     
     def wander_wrapper_coordinator(problem_description: str) -> str:
@@ -865,9 +854,14 @@ def alicanto(
         ]
     )
 
-    print("\n--- Step 1: Generating hypotheses and personas ---")
-    
-    one_shot_example_hypotheses = """
+    messages = []
+    summarized_history = []
+    file_provenance = {}
+
+    if not skip_research:
+        print("\n--- Step 1: Generating hypotheses and personas ---")
+        
+        one_shot_example_hypotheses = """
 "example_input": "Investigate the impact of quantum annealing on protein folding.",
 "example_output": {
     "hypotheses": [
@@ -877,7 +871,7 @@ def alicanto(
     ]
 }
 """
-    hypotheses_prompt = f"""Based on the following research topic, generate a list of {num_agents} distinct, specific, and empirically testable hypotheses.
+        hypotheses_prompt = f"""Based on the following research topic, generate a list of {num_agents} distinct, specific, and empirically testable hypotheses.
 
 TOPIC: "{query}"
 
@@ -888,73 +882,73 @@ Here is an example of the expected input and output format:
 
 Return ONLY the JSON object.
 """
-    
-    print("Generating hypotheses...")
-    response = get_llm_response(
-        hypotheses_prompt,
-        model=model,
-        provider=provider,
-        npc=alicanto_coordinator,
-        format='json'
-    )
-    
-    if not response or not response.get('response'):
-        print("ERROR: Failed to get hypotheses response")
-        return
-    
-    hypotheses = response.get('response').get('hypotheses')
-    if not hypotheses:
-        print("ERROR: No hypotheses generated")
-        return
-    
-    print(f"Generated {len(hypotheses)} hypotheses:")
-    for i, h in enumerate(hypotheses):
-        print(f"  {i+1}. {h}")
-    
-    print("\nGenerating agent personas...")
-    personas = generate_sub_agent_personas(
-        query,
-        num_agents,
-        model,
-        provider,
-        alicanto_coordinator
-    )
-    
-    if not personas:
-        print("ERROR: No personas generated")
-        return
-    
-    print(f"Generated {len(personas)} personas:")
-    for i, p in enumerate(personas):
-        print(f"  {i+1}. {p.get('name')}: {p.get('persona')}")
-
-    print("\n--- Step 2: Delegating hypotheses to Sub-Agents for serial execution ---")
-    
-    all_traces = []
-    for i, hypo in enumerate(hypotheses):
-        persona = personas[i % len(personas)]
-        print(f"\nStarting sub-agent {i+1}/{len(hypotheses)}")
-        trace = sub_agent_trace(
-            hypo,
-            persona,
+        
+        print("Generating hypotheses...")
+        response = get_llm_response(
+            hypotheses_prompt,
+            model=model,
+            provider=provider,
+            npc=alicanto_coordinator,
+            format='json'
+        )
+        
+        if not response or not response.get('response'):
+            print("ERROR: Failed to get hypotheses response")
+            return
+        
+        hypotheses = response.get('response').get('hypotheses')
+        if not hypotheses:
+            print("ERROR: No hypotheses generated")
+            return
+        
+        print(f"Generated {len(hypotheses)} hypotheses:")
+        for i, h in enumerate(hypotheses):
+            print(f"  {i+1}. {h}")
+        
+        print("\nGenerating agent personas...")
+        personas = generate_sub_agent_personas(
             query,
+            num_agents,
             model,
             provider,
-            max_steps
+            alicanto_coordinator
         )
-        all_traces.append(trace)
-        print(f"Sub-agent {i+1} completed. Success: {trace.was_successful}")
-
-    print(f"\nAll sub-agents completed. Saving traces...")
-    save_trace_for_training(all_traces)
-    compressed_research = compress_traces_for_synthesis(all_traces, model, provider, alicanto_coordinator)
+        
+        if not personas:
+            print("ERROR: No personas generated")
+            return
+        
+        print(f"Generated {len(personas)} personas:")
+        for i, p in enumerate(personas):
+            print(f"  {i+1}. {p.get('name')}: {p.get('persona')}")
 
-    print("\n--- Step 3: Creating initial paper structure ---")
-    
-    author_list = [trace.agent_name for trace in all_traces]
-    author_string = ", ".join(author_list)
-    
-    initial_latex = f"""\\documentclass{{article}}
+        print("\n--- Step 2: Delegating hypotheses to Sub-Agents for serial execution ---")
+        
+        all_traces = []
+        for i, hypo in enumerate(hypotheses):
+            persona = personas[i % len(personas)]
+            print(f"\nStarting sub-agent {i+1}/{len(hypotheses)}")
+            trace = sub_agent_trace(
+                hypo,
+                persona,
+                query,
+                model,
+                provider,
+                max_steps
+            )
+            all_traces.append(trace)
+            print(f"Sub-agent {i+1} completed. Success: {trace.was_successful}")
+
+        print(f"\nAll sub-agents completed. Saving traces...")
+        save_trace_for_training(all_traces)
+        compressed_research = compress_traces_for_synthesis(all_traces, model, provider, alicanto_coordinator)
+
+        print("\n--- Step 3: Creating initial paper structure ---")
+        
+        author_list = [trace.agent_name for trace in all_traces]
+        author_string = ", ".join(author_list)
+        
+        initial_latex = f"""\\documentclass{{article}}
 \\title{{% TODO: TITLE}}
 \\author{{{author_string}}}
 \\date{{\\today}}
@@ -979,59 +973,106 @@ Return ONLY the JSON object.
 
 \\end{{document}}"""
 
-    create_file("paper.tex", initial_latex)
+        create_file("paper.tex", initial_latex)
+    else:
+        print("\n--- Skipping research phase - loading existing data ---")
+        
+        if os.path.exists("paper.tex"):
+            print("Found existing paper.tex")
+        else:
+            print("No existing paper.tex found, creating basic template...")
+            basic_latex = f"""\\documentclass{{article}}
+\\title{{{query.title()}}}
+\\author{{Research Team}}
+\\date{{\\today}}
+\\begin{{document}}
+\\maketitle
+
+\\begin{{abstract}}
+% TODO: ABSTRACT
+\\end{{abstract}}
+
+\\section{{Introduction}}
+% TODO: INTRODUCTION
+
+\\section{{Methods}}
+% TODO: METHODS
+
+\\section{{Results}}
+% TODO: RESULTS
+
+\\section{{Discussion}}
+% TODO: DISCUSSION
+
+\\end{{document}}"""
+            create_file("paper.tex", basic_latex)
+        
+        compressed_research = f"Research topic: {query}. Previous research data should be available in local files."
 
     print("\n--- Step 4: Iterative paper writing ---")
     
-    todo_sections = ["TITLE", "ABSTRACT", "INTRODUCTION", "METHODS", "RESULTS", "DISCUSSION"]
-    
-    for section_round in range(len(todo_sections)):
+    for section_round in range(25):
         print(f"\n--- Section Round {section_round + 1} ---")
         
-        current_paper = read_file("paper.tex")
-        sections_status = {section: "EMPTY" if f"% TODO: {section}" in current_paper else "COMPLETE" 
-                          for section in todo_sections}
-        
-        print(f"Section status: {sections_status}")
-        
-        # Find next section to work on
-        next_section = None
-        for section in todo_sections:
-            if sections_status[section] == "EMPTY":
-                next_section = section
-                break
-        
-        if not next_section:
-            print("All sections complete")
-            break
+        fs_before = get_filesystem_state()
         
-        print(f"Working on section: {next_section}")
+        provenance_summary = []
+        for filename, prov in file_provenance.items():
+            history = "; ".join([f"Step {step}: {action} ({checksum}) - {changes}" for step, action, checksum, changes in prov.step_history])
+            provenance_summary.append(f"{filename}: {history}")
         
-        # Autonomous loop for this section (like sub-agents)
-        messages = []
+        history_str = "\n".join(summarized_history)
+        current_paper = read_file("paper.tex")
         
-        initial_prompt = f"""You are writing a research paper about: "{query}"
+        initial_prompt = f"""You are writing a research paper about: "{query}" located at ./paper.tex
 
 Research data from sub-agents: {compressed_research}
 
 Current paper content:
 {current_paper}
 
-Your task: Complete the {next_section} section by replacing "% TODO: {next_section}" with actual content.
+FILE PROVENANCE HISTORY:
+{chr(10).join(provenance_summary)}
+
+COMPLETE ACTION HISTORY:
+BEGIN HISTORY
+{history_str}
+END HISTORY
+
+Ensure the paper contains the following sections and that they have a coherent narrative by the end of your work.
+work iteratively, so do not worry about making it all in one step.
+
+SECTIONS: Title, Abstract, Intro, Methods, Results, Discussion, Conclusions,
+
+You may choose to add subsections as you wish, but do not do so for the introduction. 
+
+You must ensure citations are properly included in your results and cited with the \cite{{author_year}} format , keeping in mind
+to also start and maintain a .bib file separate from any currently provided. be sure to reference this as well. 
+
+Your title short be short, informative, and eye-catching. 
+Every section and paragraph should be written in a formal academic style, motivating pieces of information and ensuring
+each sentence must flow well into the last, and the paper must have a strong motivation with substantial literature review to establish
+the need for the investigation. The paper should focus only on 1-2 major findings, with 5-10 minor findings detailed in the conclusions.
+The discussion should primarily focus on commenting on how previous work may be re-interpreted in light of your findings. Do not simply splatter text
+into a discussion but be thoughtful and helpful. The discussion should connect to broader works and discuss specifics of those works. Do not simply regurgitate the
 
 Use replace_in_file to update the paper. Use search_papers or search_web if you need more information.
 
-Focus ONLY on the {next_section} section. Write 2-4 paragraphs of substantial academic content.
+Write 2-4 paragraphs of substantial academic content. Include figures and tables based on the results of the experiments.
 
-Available tools: replace_in_file, read_file, search_papers, search_web"""
+Available tools: replace_in_file, read_file, search_papers, search_web, list_files"""
+
+        all_thoughts = []
+        all_actions = []
+        all_outcomes = []
 
-        for micro_step in range(5):  # 5 turns per section like sub-agents
-            print(f"\n--- Micro-step {micro_step + 1}/5 for {next_section} ---")
+        for micro_step in range(5):
+            print(f"\n--- Micro-step {micro_step + 1}/5  ---")
             
             if micro_step == 0:
                 current_prompt = initial_prompt
             else:
-                current_prompt = f"Continue working on the {next_section} section. What's your next action?"
+                current_prompt = f"continue "
             
             try:
                 response = alicanto_coordinator.get_llm_response(
@@ -1039,11 +1080,54 @@ Available tools: replace_in_file, read_file, search_papers, search_web"""
                     messages=messages, 
                     auto_process_tool_calls=True
                 )
+                print('response: ', response['response'])
+                print('tool calls: ', response['tool_calls'])
+                print('tool results: ', response['tool_results'])
+                
+                messages = response.get('messages', [])
+                
+                thought = response.get('response') or ""  # Handle None case
+                all_thoughts.append(thought)
+                
+                if response.get('tool_results'):
+                    tool_results = response['tool_results']
+                    action_str = ", ".join([f"{res['tool_name']}({res.get('arguments', {})})" for res in tool_results])
+                    outcomes = [str(res.get('result', '')) for res in tool_results]
+                    outcome_str = " | ".join(outcomes)
+                    all_actions.append(action_str)
+                    all_outcomes.append(outcome_str)
+                
             except (Timeout, ContextWindowExceededError):
                 break
-                
-            messages = response.get('messages', [])
-            
+            except Exception as e:
+                print(f"Error in micro-step: {e}")
+                break
+        
+        fs_after = get_filesystem_state()
+        
+        combined_thought = " ".join(filter(None, all_thoughts))  # Filter out None values
+        combined_action = " | ".join(filter(None, all_actions))
+        combined_outcome = " | ".join(filter(None, all_outcomes))
+        
+        print(f"\nCOMPRESSING WRITING SESSION...")
+        print(f"THOUGHTS: {len(all_thoughts)} messages")
+        print(f"ACTIONS: {len(all_actions)} tool uses")
+        
+        summary = summarize_step(combined_thought, 
+                                 combined_action,
+                                 combined_outcome,
+                                 fs_before, 
+                                 fs_after, 
+                                 file_provenance, 
+                                 section_round + 1, 
+                                 model, 
+                                 provider, 
+                                 alicanto_coordinator)
+        
+        print(f"SUMMARY: {summary.get('summary', 'No summary')}")
+        print(f"NEXT STEP: {summary.get('next_step', 'No next step')}")
+        
+        summarized_history.append(f"Round {section_round + 1}: {summary.get('summary')} ")
             
     final_paper = read_file("paper.tex")
     print(f"\n{'='*60}")
@@ -1051,8 +1135,9 @@ Available tools: replace_in_file, read_file, search_papers, search_web"""
     print("="*60)
     print(final_paper)
     print(f"\nPaper saved as paper.tex")
-
-
+    
+    
+    
 def main():
     parser = argparse.ArgumentParser(description="Alicanto Multi-Agent Research System")
     parser.add_argument("topic", help="Research topic to investigate")
@@ -1060,6 +1145,7 @@ def main():
     parser.add_argument("--max-steps", type=int, default=10, help="Maximum steps for each sub-agent.")
     parser.add_argument("--model", default=NPCSH_CHAT_MODEL, help="LLM model to use")
     parser.add_argument("--provider", default=NPCSH_CHAT_PROVIDER, help="LLM provider to use")
+    parser.add_argument("--skip-research", action="store_true", help="Skip research phase and go directly to paper writing")
     
     args = parser.parse_args()
     
@@ -1068,8 +1154,6 @@ def main():
         num_agents=args.num_agents,
         max_steps=args.max_steps,
         model=args.model,
-        provider=args.provider
-    )
-
-if __name__ == "__main__":
-    main()
+        provider=args.provider,
+        skip_research=args.skip_research
+    )

npcsh/corca.py

@@ -250,8 +250,6 @@ def process_mcp_stream(stream_response, active_npc):
 
 
 
-
-
 def execute_command_corca(command: str, state: ShellState, command_history, selected_mcp_tools_names: Optional[List[str]] = None) -> Tuple[ShellState, Any]:
     mcp_tools_for_llm = []
     
@@ -272,6 +270,13 @@ def execute_command_corca(command: str, state: ShellState, command_history, sele
 
     active_npc = state.npc if isinstance(state.npc, NPC) else NPC(name="default")
 
+    if not state.messages or not any("working directory" in msg.get("content", "").lower() for msg in state.messages):
+        context_message = {
+            "role": "system", 
+            "content": f"You are currently operating in the directory: {state.current_path}. All file operations should be relative to this location unless explicitly specified otherwise."
+        }
+        state.messages.insert(0, context_message)
+
     if len(state.messages) > 50:
         compressed_state = active_npc.compress_planning_state(state.messages)
         state.messages = [{"role": "system", "content": compressed_state}]
@@ -328,7 +333,6 @@ def execute_command_corca(command: str, state: ShellState, command_history, sele
             team=state.team  
         )
          
-
     stream_response = response_dict.get('response')
     messages = response_dict.get('messages', state.messages)
     
@@ -1065,15 +1069,17 @@ def enter_corca_mode(command: str, **kwargs):
             
             if not user_input:
                 continue
-
-            state, output = execute_command_corca(user_input, state, command_history)
-            
-            process_corca_result(user_input, 
-                           state, 
-                           output, 
-                           command_history, 
-                            )
+            try:
+                state, output = execute_command_corca(user_input, state, command_history)
             
+                process_corca_result(user_input, 
+                            state, 
+                            output, 
+                            command_history, 
+                                )
+            except Exception as e:
+                print(f'An Exception has occurred {e}')   
+                         
         except KeyboardInterrupt:
             print()
             continue

npcsh/routes.py

@@ -232,7 +232,13 @@ def compile_handler(command: str, **kwargs):
 
 @router.route("corca", "Enter the Corca MCP-powered agentic shell. Usage: /corca [--mcp-server-path path]")
 def corca_handler(command: str, **kwargs):
-    return enter_corca_mode(command=command, **kwargs)
+    from npcsh._state import initial_state, setup_shell 
+    command_history, team, default_npc = setup_shell()
+    
+    
+    return enter_corca_mode(command=command, 
+                            command_history = command_history, 
+                            shell_state=initial_state)
     
 @router.route("flush", "Flush the last N messages")
 def flush_handler(command: str, **kwargs):
@@ -1131,7 +1137,7 @@ def yap_handler(command: str, **kwargs):
 def alicanto_handler(command: str, **kwargs):
     messages = safe_get(kwargs, "messages", [])
     parts = shlex.split(command)
-  
+    skip_research = safe_get(kwargs, "skip_research", True)
     query = ""
     num_npcs = safe_get(kwargs, 'num_npcs', 5)
     depth = safe_get(kwargs, 'depth', 3)
@@ -1228,6 +1234,7 @@ def alicanto_handler(command: str, **kwargs):
             model=model,
             provider=provider, 
             max_steps = safe_get(kwargs, 'max_steps', 20),
+            skip_research = skip_research
 
         )
         

{npcsh-1.0.33.dist-info → npcsh-1.0.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: npcsh
-Version: 1.0.33
+Version: 1.0.35
 Summary: npcsh is a command-line toolkit for using AI agents in novel ways.
 Home-page: https://github.com/NPC-Worldwide/npcsh
 Author: Christopher Agostino

{npcsh-1.0.33.dist-info → npcsh-1.0.35.dist-info}/RECORD

@@ -1,7 +1,7 @@
 npcsh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-npcsh/_state.py,sha256=sntRSm9DKthandawaLCf-semAm_1CNx3AUh-066G248,86498
-npcsh/alicanto.py,sha256=ZftzxfQPQuuj9VB9V2FCTQN5NIE9Rvsg4iNiNqOUE6U,38118
-npcsh/corca.py,sha256=4OluICXdL0APOWmk9JdeLuMbQPiA3LoupUmCJ8Ot0dE,49272
+npcsh/_state.py,sha256=96NR32dMOytt1XIUvvO4CGODx3i4hMnaPJ-IlMJAMUE,93032
+npcsh/alicanto.py,sha256=xcYlKZY6_NcnPUADosGKRuY5SVeZ_4msw82-fE2JZN8,42117
+npcsh/corca.py,sha256=ZABu9d7HmKR3S-YF5NNP25gqvAhoOPRNJDxKqdOO-OM,49835
 npcsh/guac.py,sha256=sVdLYVkzkQw6TE7crtLUX0QJZFkzQthWZTe1p7IfAQE,80412
 npcsh/mcp_helpers.py,sha256=9TsCfcquGu_vX4WaKlY3J3P13-uxruQKrXng-jJ5YyY,11176
 npcsh/mcp_server.py,sha256=krc1rhiSU9gI76w99Ph3Mk7OyUVzfiEXKMvVid-7-Ik,5201
@@ -9,7 +9,7 @@ npcsh/npc.py,sha256=OjCDu03hAcXyqPbzMeBBr1cBnmQsB1FBhd7kLNsWALc,8330
 npcsh/npcsh.py,sha256=3WLkZxHGzRekVGxHiJUA4VFyhC3A1jwX11aB0kgzE9s,8818
 npcsh/plonk.py,sha256=IfOuiE5FBvk-EIsrWFjGy0SrNywDpn4a49E7seBtEmY,14246
 npcsh/pti.py,sha256=UciiiH2Kz4ERQFy0-FX6BQEU2VxYQEUril-_Cvj76Y0,7853
-npcsh/routes.py,sha256=ulQMLrNwOAQqfbHC1Nijr8lkn9v4efviCdkgZe9T0iY,44106
+npcsh/routes.py,sha256=MMsHSoVp6r8OeoABO6stM4lSba4fOGz_QpzEIWS1nos,44437
 npcsh/spool.py,sha256=oCive2dbn1o3UGUJnFMzfON6g4bOnauuzyyQBgul6RI,9839
 npcsh/wander.py,sha256=8WOX8az8BXjizXGraEvu-ZVphi6PECKZzo9alTK4gmA,21730
 npcsh/yap.py,sha256=QU-j9eg8zixXG6nyjoIYXsanJ4FjPnzhS4aJ241HLxw,18467
@@ -39,35 +39,35 @@ npcsh/npc_team/jinxs/image_generation.jinx,sha256=bQxZdEm0_eqvf_OJSHw3qarp8Klp3L
 npcsh/npc_team/jinxs/internet_search.jinx,sha256=s8zVxwKFUAof_VzQrwB5dpAQdeJ6hUBkbIdRsT-I5mo,1267
 npcsh/npc_team/jinxs/python_executor.jinx,sha256=vZz3pZaj1BnPFHMs_wpyjRc0b32JR4rLhZfulCMDF1s,398
 npcsh/npc_team/jinxs/screen_cap.jinx,sha256=-4DG0EiEe61N_kMhVqqHKhLVGOLuZQT9ax6IZk20NjI,960
-npcsh-1.0.33.data/data/npcsh/npc_team/alicanto.npc,sha256=y9yDY3lq8ZwxQxpnrgle8w5IJwZqvxDepZFU4OaZCtg,148
-npcsh-1.0.33.data/data/npcsh/npc_team/alicanto.png,sha256=A7xeMbcoKGjlkELxJEVifCEZLVWbOKZarTN5ZFJG-FM,3519858
-npcsh-1.0.33.data/data/npcsh/npc_team/bash_executer.jinx,sha256=C_oQccOY8cKevMMPLRdznlMOccQvLgyzyOIThXvmrD8,692
-npcsh-1.0.33.data/data/npcsh/npc_team/corca.npc,sha256=HI3Bs6KlUBPMz7icF1TRE8-V3f3EdU_VxvQxEpru3L4,662
-npcsh-1.0.33.data/data/npcsh/npc_team/corca.png,sha256=0lF70hKu6tY-37YmIPVF2cuaPzvnQ4-UtQOzuAbKEf4,1666776
-npcsh-1.0.33.data/data/npcsh/npc_team/edit_file.jinx,sha256=4PaJs8g_cdeDpbQwQSBycU5RDA0rczEC_NpLfLjo74Y,3490
-npcsh-1.0.33.data/data/npcsh/npc_team/foreman.npc,sha256=WqB8jLfBToGmr8c1vip1KOnTHxfXlGXwDUGnZoDMQr0,327
-npcsh-1.0.33.data/data/npcsh/npc_team/frederic.npc,sha256=EE2dOUItp-VKuW3ZMSHffmIEO4evjPcU2W_C4P3WXbY,362
-npcsh-1.0.33.data/data/npcsh/npc_team/frederic4.png,sha256=ll8uoV0npnPp5HVJWv7h0xDSeuq4pqsk_gYGBHLS0VY,1590744
-npcsh-1.0.33.data/data/npcsh/npc_team/guac.png,sha256=MCE7eJuEJwLJEzc9FS7lL62Mm-38jQRHkxXogPfOTuw,211470
-npcsh-1.0.33.data/data/npcsh/npc_team/image_generation.jinx,sha256=bQxZdEm0_eqvf_OJSHw3qarp8Klp3LlBDv1_HY3COo4,1307
-npcsh-1.0.33.data/data/npcsh/npc_team/internet_search.jinx,sha256=s8zVxwKFUAof_VzQrwB5dpAQdeJ6hUBkbIdRsT-I5mo,1267
-npcsh-1.0.33.data/data/npcsh/npc_team/kadiefa.npc,sha256=Yl5a4wrfe4F2f6Ndw_ukzlVVX7NE9g_mG-3QqJSkg_o,381
-npcsh-1.0.33.data/data/npcsh/npc_team/kadiefa.png,sha256=3CAwL8crKIwJko6o75Z6OYYEEM9Rk--yGzCJg7zoszg,3062528
-npcsh-1.0.33.data/data/npcsh/npc_team/npcsh.ctx,sha256=-jKYaPm2YbZHAGgWAXhyPIwhiNe1H1ZRFg1Zc7tHSxk,1049
-npcsh-1.0.33.data/data/npcsh/npc_team/npcsh_sibiji.png,sha256=9fUqgYMsSHmaH-kBTBQ7N5UCS5-eLZF94Log0O3mtFg,4544
-npcsh-1.0.33.data/data/npcsh/npc_team/plonk.npc,sha256=u1m2a1D512XGQ2kC3eWDAY8Y2IvpkNU73DI_CPE65UE,90
-npcsh-1.0.33.data/data/npcsh/npc_team/plonk.png,sha256=IU5ey-Dl4HEKlwnf75RSWNSHpF8rVqGmdbsa0deL4rQ,2727773
-npcsh-1.0.33.data/data/npcsh/npc_team/plonkjr.npc,sha256=It-i-BEuG0XddKk0d85onk2aJr9Pe5pLnJzNaCWaQIM,87
-npcsh-1.0.33.data/data/npcsh/npc_team/plonkjr.png,sha256=MqLEGwsyECUeODZIti0HQQrMMVxA6XERpW01R06NbpY,2606710
-npcsh-1.0.33.data/data/npcsh/npc_team/python_executor.jinx,sha256=vZz3pZaj1BnPFHMs_wpyjRc0b32JR4rLhZfulCMDF1s,398
-npcsh-1.0.33.data/data/npcsh/npc_team/screen_cap.jinx,sha256=-4DG0EiEe61N_kMhVqqHKhLVGOLuZQT9ax6IZk20NjI,960
-npcsh-1.0.33.data/data/npcsh/npc_team/sibiji.npc,sha256=Hb4wXKIObKKgibwnio5hLec9yd_9bKDCA87Nm2zijFA,216
-npcsh-1.0.33.data/data/npcsh/npc_team/sibiji.png,sha256=1dlZb7J3E62FcVo9CVOzLb8nu1bIUV7cr97nsFocHCM,35615
-npcsh-1.0.33.data/data/npcsh/npc_team/spool.png,sha256=LWTLkwDxXBfLuSUCX32_lo5yAmLYGsA67Xpsz-7MmWU,2876725
-npcsh-1.0.33.data/data/npcsh/npc_team/yap.png,sha256=_l7UbWnXJdsy4Mx-x5l9DT0R6ize3HTnkwQQnOFlI18,1548649
-npcsh-1.0.33.dist-info/licenses/LICENSE,sha256=IKBvAECHP-aCiJtE4cHGCE5Yl0tozYz02PomGeWS3y4,1070
-npcsh-1.0.33.dist-info/METADATA,sha256=oxuT3G2l8HLWmgzV4GlVCUYaBx5C1LT-b2IggcgCvtA,25486
-npcsh-1.0.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-npcsh-1.0.33.dist-info/entry_points.txt,sha256=S5yIuGm8ZXQ4siHYgN5gs0J7bxgobSEULXf8L5HaW5o,206
-npcsh-1.0.33.dist-info/top_level.txt,sha256=kHSNgKMCkfjV95-DH0YSp1LLBi0HXdF3w57j7MQON3E,6
-npcsh-1.0.33.dist-info/RECORD,,
+npcsh-1.0.35.data/data/npcsh/npc_team/alicanto.npc,sha256=y9yDY3lq8ZwxQxpnrgle8w5IJwZqvxDepZFU4OaZCtg,148
+npcsh-1.0.35.data/data/npcsh/npc_team/alicanto.png,sha256=A7xeMbcoKGjlkELxJEVifCEZLVWbOKZarTN5ZFJG-FM,3519858
+npcsh-1.0.35.data/data/npcsh/npc_team/bash_executer.jinx,sha256=C_oQccOY8cKevMMPLRdznlMOccQvLgyzyOIThXvmrD8,692
+npcsh-1.0.35.data/data/npcsh/npc_team/corca.npc,sha256=HI3Bs6KlUBPMz7icF1TRE8-V3f3EdU_VxvQxEpru3L4,662
+npcsh-1.0.35.data/data/npcsh/npc_team/corca.png,sha256=0lF70hKu6tY-37YmIPVF2cuaPzvnQ4-UtQOzuAbKEf4,1666776
+npcsh-1.0.35.data/data/npcsh/npc_team/edit_file.jinx,sha256=4PaJs8g_cdeDpbQwQSBycU5RDA0rczEC_NpLfLjo74Y,3490
+npcsh-1.0.35.data/data/npcsh/npc_team/foreman.npc,sha256=WqB8jLfBToGmr8c1vip1KOnTHxfXlGXwDUGnZoDMQr0,327
+npcsh-1.0.35.data/data/npcsh/npc_team/frederic.npc,sha256=EE2dOUItp-VKuW3ZMSHffmIEO4evjPcU2W_C4P3WXbY,362
+npcsh-1.0.35.data/data/npcsh/npc_team/frederic4.png,sha256=ll8uoV0npnPp5HVJWv7h0xDSeuq4pqsk_gYGBHLS0VY,1590744
+npcsh-1.0.35.data/data/npcsh/npc_team/guac.png,sha256=MCE7eJuEJwLJEzc9FS7lL62Mm-38jQRHkxXogPfOTuw,211470
+npcsh-1.0.35.data/data/npcsh/npc_team/image_generation.jinx,sha256=bQxZdEm0_eqvf_OJSHw3qarp8Klp3LlBDv1_HY3COo4,1307
+npcsh-1.0.35.data/data/npcsh/npc_team/internet_search.jinx,sha256=s8zVxwKFUAof_VzQrwB5dpAQdeJ6hUBkbIdRsT-I5mo,1267
+npcsh-1.0.35.data/data/npcsh/npc_team/kadiefa.npc,sha256=Yl5a4wrfe4F2f6Ndw_ukzlVVX7NE9g_mG-3QqJSkg_o,381
+npcsh-1.0.35.data/data/npcsh/npc_team/kadiefa.png,sha256=3CAwL8crKIwJko6o75Z6OYYEEM9Rk--yGzCJg7zoszg,3062528
+npcsh-1.0.35.data/data/npcsh/npc_team/npcsh.ctx,sha256=-jKYaPm2YbZHAGgWAXhyPIwhiNe1H1ZRFg1Zc7tHSxk,1049
+npcsh-1.0.35.data/data/npcsh/npc_team/npcsh_sibiji.png,sha256=9fUqgYMsSHmaH-kBTBQ7N5UCS5-eLZF94Log0O3mtFg,4544
+npcsh-1.0.35.data/data/npcsh/npc_team/plonk.npc,sha256=u1m2a1D512XGQ2kC3eWDAY8Y2IvpkNU73DI_CPE65UE,90
+npcsh-1.0.35.data/data/npcsh/npc_team/plonk.png,sha256=IU5ey-Dl4HEKlwnf75RSWNSHpF8rVqGmdbsa0deL4rQ,2727773
+npcsh-1.0.35.data/data/npcsh/npc_team/plonkjr.npc,sha256=It-i-BEuG0XddKk0d85onk2aJr9Pe5pLnJzNaCWaQIM,87
+npcsh-1.0.35.data/data/npcsh/npc_team/plonkjr.png,sha256=MqLEGwsyECUeODZIti0HQQrMMVxA6XERpW01R06NbpY,2606710
+npcsh-1.0.35.data/data/npcsh/npc_team/python_executor.jinx,sha256=vZz3pZaj1BnPFHMs_wpyjRc0b32JR4rLhZfulCMDF1s,398
+npcsh-1.0.35.data/data/npcsh/npc_team/screen_cap.jinx,sha256=-4DG0EiEe61N_kMhVqqHKhLVGOLuZQT9ax6IZk20NjI,960
+npcsh-1.0.35.data/data/npcsh/npc_team/sibiji.npc,sha256=Hb4wXKIObKKgibwnio5hLec9yd_9bKDCA87Nm2zijFA,216
+npcsh-1.0.35.data/data/npcsh/npc_team/sibiji.png,sha256=1dlZb7J3E62FcVo9CVOzLb8nu1bIUV7cr97nsFocHCM,35615
+npcsh-1.0.35.data/data/npcsh/npc_team/spool.png,sha256=LWTLkwDxXBfLuSUCX32_lo5yAmLYGsA67Xpsz-7MmWU,2876725
+npcsh-1.0.35.data/data/npcsh/npc_team/yap.png,sha256=_l7UbWnXJdsy4Mx-x5l9DT0R6ize3HTnkwQQnOFlI18,1548649
+npcsh-1.0.35.dist-info/licenses/LICENSE,sha256=IKBvAECHP-aCiJtE4cHGCE5Yl0tozYz02PomGeWS3y4,1070
+npcsh-1.0.35.dist-info/METADATA,sha256=1EVu7WXtWuOl3yCQxrW9F8mtXpXlXVYxYe3XWZ4PJrM,25486
+npcsh-1.0.35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+npcsh-1.0.35.dist-info/entry_points.txt,sha256=S5yIuGm8ZXQ4siHYgN5gs0J7bxgobSEULXf8L5HaW5o,206
+npcsh-1.0.35.dist-info/top_level.txt,sha256=kHSNgKMCkfjV95-DH0YSp1LLBi0HXdF3w57j7MQON3E,6
+npcsh-1.0.35.dist-info/RECORD,,