apsimo 1.4.4__tar.gz → 1.4.5__tar.gz

{apsimo-1.4.4 → apsimo-1.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apsimo
-Version: 1.4.4
+Version: 1.4.5
 Summary: Persistent identity, memory and autonomy for AI agents
 License-Expression: MIT
 Requires-Python: >=3.11
@@ -28,7 +28,7 @@ Requires-Dist: pandas>=2.0; extra == "vectors"
 Requires-Dist: pyarrow>=15.0; extra == "vectors"
 Requires-Dist: lancedb>=0.10; extra == "vectors"
 Provides-Extra: hermes
-Requires-Dist: apsimo-hermes<2,>=1.4.4; extra == "hermes"
+Requires-Dist: apsimo-hermes<2,>=1.4.5; extra == "hermes"
 Provides-Extra: mcp
 Requires-Dist: mcp[cli]<2,>=1.0; extra == "mcp"
 Provides-Extra: lancedb

{apsimo-1.4.4 → apsimo-1.4.5}/apsimo/api/routers/host.py

@@ -2516,7 +2516,7 @@ async def context_assemble(
 
     # --- Memory: authorized candidates, one selection and one budget ---
     if _canonical_person_allowed and query_text:
-        from apsimo.intelligence.graph.recall import source_candidates
+        from apsimo.memory.recall import source_candidates
         beliefs, quotations, source_hits, semantic_media = [], [], [], []
         source_ledger = None
         if not _canonical_only and _graph is not None:
@@ -2581,7 +2581,7 @@ async def context_assemble(
                     contact_tz, body.context.timezone or ("UTC" if _canonical_only else None)))
             if source_ledger is not None:
                 from apsimo.beliefs.source_projection import SourceClaimProjection
-                from apsimo.intelligence.graph.selection import current_work_query
+                from apsimo.memory.selection import current_work_query
                 beliefs, quotations = SourceClaimProjection(source_ledger).prepare_context(
                     beliefs, source_hits, contact_id=body.context.contact_id,
                     session_id=body.context.session_id, time_query=time_query,
@@ -2598,7 +2598,7 @@ async def context_assemble(
                     # The projected view preserves envelope and current-source
                     # checks. A fact needs query overlap before any fail-open
                     # reranker path; confidence alone never makes it relevant.
-                    from apsimo.intelligence.graph.recall import contact_fact_candidates
+                    from apsimo.memory.recall import contact_fact_candidates
                     fact_result = _tom_context_facts.list_facts(
                         contact_id=body.context.contact_id, limit=512)
                     facts = fact_result if isinstance(fact_result, list) else fact_result.get('facts', [])
@@ -2623,7 +2623,7 @@ async def context_assemble(
                 from apsimo.turns.source_annotations import current_candidates
                 retained = current_candidates(source_ledger, selected, **annotation_scope)
                 if len(retained) != len(selected):
-                    from apsimo.intelligence.graph.recall import pack_memory_context
+                    from apsimo.memory.recall import pack_memory_context
                     selected, body_text = pack_memory_context(retained, limit=5,
                         max_chars=max(0, min(max_chars, 24000)))
             if body_text:
@@ -11284,7 +11284,7 @@ async def enriched_context(
             and (_p8_runtime is None or _enriched_p8_viewer is not None):
         async def _shared_facts():
             try:
-                from apsimo.intelligence.graph.recall import contact_fact_candidates, pack_memory_context
+                from apsimo.memory.recall import contact_fact_candidates, pack_memory_context
                 from apsimo.turns.source_annotations import expand, current_candidates
                 store = _p8_runtime.facts_store if _p8_runtime is not None else _facts_store
                 view = (_p8_runtime.projected_facts_view(_enriched_p8_viewer,
@@ -11725,8 +11725,8 @@ def _memory_context_selector():
     """Keep one selector per active reranker, also usable without graph storage."""
     global _context_recall_selector
     if _context_recall_selector is None or _context_recall_selector[0] is not _reranker:
-        from apsimo.intelligence.graph.selection import RecallSelector
-        from apsimo.intelligence.graph.recall import provider_calibration_metadata
+        from apsimo.memory.selection import RecallSelector
+        from apsimo.memory.recall import provider_calibration_metadata
         provider = _reranker
         selector = RecallSelector(
             provider.rerank if provider is not None else None,

{apsimo-1.4.4 → apsimo-1.4.5}/apsimo/beliefs/source_projection.py

@@ -470,7 +470,7 @@ class SourceClaimProjection:
         Unknown, corrected, changed, multiple-input and cross-scope provenance
         remains recallable. This transient hint never changes stored history.
         """
-        from apsimo.intelligence.graph.selection import current_work_query
+        from apsimo.memory.selection import current_work_query
         from apsimo.turns.idempotency import canonical_turn_digest, source_message_hash
         if message.get('role') != 'assistant' or source['scope'] != 'person':
             return False
@@ -521,7 +521,7 @@ class SourceClaimProjection:
         """
         from apsimo.turns.idempotency import source_message_hash
         from apsimo.turns.audio import source_text
-        from apsimo.intelligence.graph.recall import source_candidates
+        from apsimo.memory.recall import source_candidates
         turn_ids = list(dict.fromkeys(
             [row["turn_id"] for row in source_hits] + [str(row["source_uri"])[5:] for row in beliefs
              if str(row.get("source_uri") or "").startswith("turn:")]))

{apsimo-1.4.4 → apsimo-1.4.5}/apsimo/cli.py

@@ -43,6 +43,7 @@ def main() -> None:
     init_p.add_argument("--quiet-hours", help="Optional local follow-up quiet window, HH:MM-HH:MM; grants no outreach permission")
     init_p.add_argument("--whatsapp-read-receipts", choices=["on", "off"], help="Set this Hermes profile's read receipts for accepted WhatsApp messages; omission preserves its setting")
     init_p.add_argument("--preferences-only", action="store_true", help="Update only an existing Hermes config preference; skip instance and model setup")
+    init_p.add_argument("--skills-only", action="store_true", help="Install or explicitly refresh owned bundled skills in one Hermes profile; no instance or model setup")
     init_p.add_argument("--preview", action="store_true", help="With --preferences-only, show changed preference paths without writing")
     init_p.add_argument("--model-url", help="One local OpenAI-compatible API root")
     init_p.add_argument("--model", help="Model identifier at that endpoint")
@@ -313,7 +314,7 @@ def main() -> None:
         code = run_init(root_dir=args.dir, args=args)
         if code != 0:
             sys.exit(code)
-        if args.preferences_only:
+        if args.preferences_only or args.skills_only:
             return
 
         # Initialize Apsimo identity if not already done

{apsimo-1.4.4 → apsimo-1.4.5}/apsimo/intelligence/graph/client.py

@@ -1260,7 +1260,7 @@ class ColonyGraph:
                             memories.append(mem)
 
                 if hybrid:
-                    from .recall import fuse_candidates
+                    from apsimo.memory.recall import fuse_candidates
                     candidate_limit = min(max(limit * 5, limit), max(100, limit))
                     lexical = await self._recall_lexical(
                         query, candidate_limit, min_strength, min_confidence,
@@ -1394,7 +1394,7 @@ class ColonyGraph:
         content reaches Python/reranking. A missing/populating index degrades
         to the existing vector/keyword path.
         """
-        from .recall import FULLTEXT_INDEX, lexical_query
+        from .queries import FULLTEXT_INDEX, lexical_query
         search_text = lexical_query(query)
         if not search_text:
             return []
@@ -1468,7 +1468,7 @@ class ColonyGraph:
         self, query, memories, limit, *, strength_ranking=False,
     ):
         # The same selector is used for mixed source/belief turn context.
-        from .selection import RecallSelector
+        from apsimo.memory.selection import RecallSelector
         selector = getattr(self, "_recall_selector", None)
         if selector is None:
             selector = self._recall_selector = RecallSelector(

{apsimo-1.4.4 → apsimo-1.4.5}/apsimo/intelligence/graph/queries.py

@@ -7,6 +7,16 @@ and makes it easy to test / review / optimise in one place.
 Parameters are referenced with ``$param`` syntax for Neo4j driver binding.
 """
 
+FULLTEXT_INDEX = "memory_content_fulltext"
+
+
+def lexical_query(text: str, max_terms: int = 16) -> str:
+    """Literal words/identifiers, not caller-supplied Lucene operators."""
+    from apsimo.memory.recall import lexical_terms
+
+    return " OR ".join(f'"{word}"' for word in lexical_terms(text, max_terms))
+
+
 # ──────────────────────────────────────────────────────────────────────
 # Memory operations
 # ──────────────────────────────────────────────────────────────────────

apsimo-1.4.5/apsimo/memory/__init__.py

@@ -0,0 +1 @@
+"""Shared evidence selection and rendering for Apsimo memory."""

{apsimo-1.4.4/apsimo/intelligence/graph → apsimo-1.4.5/apsimo/memory}/recall.py

@@ -1,4 +1,4 @@
-"""Small retrieval helpers shared by the existing graph/vector recall path."""
+"""Shared source candidates, rank fusion and bounded memory rendering."""
 from __future__ import annotations
 
 import re
@@ -7,7 +7,6 @@ import json
 import os
 from typing import Any
 
-FULLTEXT_INDEX = "memory_content_fulltext"
 _WORDS = re.compile(r"[^\W_]+(?:[-.][^\W_]+)*", re.UNICODE)
 _STOP = frozenset("a an and are as at be by do does for from how i in is it me of on or that the this to was what when where which who with you".split())
 
@@ -209,11 +208,6 @@ def lexical_terms(text: str, max_terms: int = 16) -> list[str]:
     return list(words)[:max_terms]
 
 
-def lexical_query(text: str, max_terms: int = 16) -> str:
-    """Literal words/identifiers, not caller-supplied Lucene operators."""
-    return " OR ".join(f'"{word}"' for word in lexical_terms(text, max_terms))
-
-
 def contact_fact_candidates(query: str, facts: list[dict[str, Any]], *, limit: int = 25) -> list[dict[str, Any]]:
     """Lexical candidates from an authorized, current source-linked fact view.
 

{apsimo-1.4.4 → apsimo-1.4.5}/apsimo/qualification/memory_cases.py

@@ -13,7 +13,7 @@ from .records import CaseSpec
 
 def _recollect(projection, query, *, contact, session, now, max_chars):
     from apsimo.beliefs.source_time import interpret_time_query
-    from apsimo.intelligence.graph.recall import pack_memory_context
+    from apsimo.memory.recall import pack_memory_context
     from apsimo.turns.source_annotations import expand, current_candidates
     ledger = projection.ledger
     hits = ledger.search_sources(query, contact_id=contact, session_id=session, limit=10)

{apsimo-1.4.4 → apsimo-1.4.5}/apsimo/server.py

@@ -1861,7 +1861,7 @@ async def lifespan(app: FastAPI):
             # set_embed_fn wiring above). Registration alone changes
             # nothing: use is gated by COLONY_RECALL_RERANK (default off).
             if graph is not None and hasattr(graph, "set_rerank_fn"):
-                from apsimo.intelligence.graph.recall import provider_calibration_metadata
+                from apsimo.memory.recall import provider_calibration_metadata
                 def recall_calibration_metadata():
                     return provider_calibration_metadata(reranker_provider)
                 graph.set_rerank_fn(

{apsimo-1.4.4 → apsimo-1.4.5}/apsimo/setup.py

@@ -1946,7 +1946,7 @@ def run_init(root_dir: str | None = None, args=None) -> int:
         root_dir: Root directory for config files
         args: Parsed argparse Namespace for non-interactive mode
     """
-    if (getattr(args, 'owner_handle', None) or getattr(args, 'preferences_only', False) or getattr(args, 'preview', False)
+    if (getattr(args, 'owner_handle', None) or getattr(args, 'preferences_only', False) or getattr(args, 'skills_only', False) or getattr(args, 'preview', False)
             or getattr(args, 'whatsapp_read_receipts', None) is not None):
         if (getattr(args, 'no_harness', False) or getattr(args, 'mcp_harnesses', None)
                 or getattr(args, 'host_framework', None) not in (None, 'hermes')):

{apsimo-1.4.4 → apsimo-1.4.5}/apsimo/setup_hermes.py

@@ -569,14 +569,25 @@ def run(root_dir=None, args=None):
     try:
         receipt_choice = getattr(args, 'whatsapp_read_receipts', None)
         preferences_only = bool(getattr(args, 'preferences_only', False))
+        skills_only = bool(getattr(args, 'skills_only', False))
         preview = bool(getattr(args, 'preview', False))
-        if preferences_only:
+        if preferences_only or skills_only:
             home = setup._resolve_hermes_home(getattr(args, 'hermes_home', None))
             selected_python = None
         else:
             home, selected_python = _select_home(args, ask)
         if preview and not preferences_only:
             raise ValueError('--preview requires --preferences-only')
+        if skills_only:
+            if root_dir or receipt_choice or any(getattr(args, name, None) for name in (
+                    'preferences_only', 'preview', 'start', 'refresh_adapter', 'replace_memory_provider',
+                    'local_work', 'native_goals', 'native_reviews', 'model_url', 'model', 'agent_name',
+                    'agent_values', 'timezone', 'quiet_hours', 'contact_name', 'owner_handle', 'encrypt',
+                    'passphrase', 'claim_genesis', 'mcp_harnesses', 'no_harness')):
+                raise ValueError('--skills-only cannot be combined with instance or preference changes')
+            from .setup_skills import prepare, install
+            install(prepare(home, _adapter_resources(getattr(args, 'adapter_wheel', None)), refresh=True))
+            return 0
         if preferences_only:
             if receipt_choice is None:
                 raise ValueError('--preferences-only requires --whatsapp-read-receipts on or off')
@@ -673,6 +684,8 @@ def run(root_dir=None, args=None):
         resources = _adapter_resources(getattr(args, 'adapter_wheel', None))
         _preflight_outbox(home, resources)
         binding = _adapter_binding(python, resources)
+        from .setup_skills import prepare as prepare_skills, install as install_skills
+        skill_updates = prepare_skills(home, resources)
         owner_name = ask('Your name', getattr(args, 'contact_name', None) or os.environ.get('USER', 'Owner'), True)
         owner_handles, owner_platforms = _owner_handles(args, ask, noninteractive)
         agent_name = ask('Agent name', getattr(args, 'agent_name', None) or 'Assistant', True)
@@ -858,6 +871,7 @@ def run(root_dir=None, args=None):
                 guiding = ('Guiding values: ' + ', '.join(agent_preferences['values']) + '.\n'
                            if agent_preferences['values'] else '')
                 create(home/'SOUL.md', f'# {agent_name}\n\nYou are {agent_name}, the personal assistant of {owner_name}.\n{guiding}Use retained evidence with its provenance; ask about uncertainty.\nYour opinions are revisable interpretations; distinguish them from facts and permissions.\nOwner consent is required for consequential external actions; an existing task-scoped consent covers only its stated scope.\n')
+            install_skills(skill_updates)
         except Exception:
             # Undo only this installation's exact bytes. Concurrent edits stay
             # intact, with original files still retained in the private state.

apsimo-1.4.5/apsimo/setup_skills.py

@@ -0,0 +1,90 @@
+"""Install owned bundled skills into one native Hermes catalog."""
+from __future__ import annotations
+
+import hashlib
+import json
+from pathlib import Path
+import re
+
+
+SKILL_NAME = 'apsimo-deep-research'
+BUNDLE_PREFIX = 'apsimo_hermes/bundled_skills/'
+SKILL_RESOURCE = f'{BUNDLE_PREFIX}{SKILL_NAME}/SKILL.md'
+
+
+def _read_owned_path(path):
+    for parent in (path, *path.parents):
+        if parent.is_symlink():
+            raise ValueError('Bundled skill destination is symlinked; existing files were preserved')
+    return path.read_bytes() if path.exists() else None
+
+
+def prepare(home, resources, *, refresh=False):
+    """Validate all packaged skill preimages before any setup writes/probe."""
+    updates = []
+    for path, content in sorted(resources.items()):
+        if not path.startswith(BUNDLE_PREFIX) or not path.endswith('/SKILL.md'):
+            continue
+        name = path[len(BUNDLE_PREFIX):-len('/SKILL.md')]
+        if not re.fullmatch(r'apsimo-[a-z0-9-]{1,56}', name):
+            raise ValueError('Bundled skill must have a canonical apsimo- name')
+        updates.extend(_prepare_skill(home, name, content, refresh=refresh))
+    if not updates:
+        raise ValueError('Selected adapter has no bundled skills')
+    return updates
+
+
+def _prepare_skill(home, name, content, *, refresh):
+    if not content:
+        raise ValueError('Selected adapter has an empty bundled skill')
+    directory = Path(home)/'skills'/name
+    skill, marker = directory/'SKILL.md', directory/'.apsimo-owned.json'
+    previous, recorded = _read_owned_path(skill), _read_owned_path(marker)
+    digest = hashlib.sha256(content).hexdigest()
+    if recorded is None:
+        if directory.exists():
+            raise ValueError('Unowned bundled skill destination was preserved; choose another profile or move your copy')
+    else:
+        try:
+            record = json.loads(recorded)
+            owned = (record['owner'] == 'apsimo-hermes' and record['version'] == 1
+                     and previous is not None
+                     and record['sha256'] == hashlib.sha256(previous).hexdigest())
+        except (ValueError, KeyError, TypeError):
+            owned = False
+        if not owned:
+            raise ValueError('Locally modified bundled skill was preserved; keep your copy or reconcile it before refreshing')
+        if previous != content and not refresh:
+            raise ValueError('Bundled skill update requires explicit apsimo init --skills-only')
+    after = (json.dumps({'owner': 'apsimo-hermes', 'version': 1, 'sha256': digest},
+                        sort_keys=True, indent=2)+'\n').encode()
+    return [(skill, previous, content), (marker, recorded, after)]
+
+
+def install(updates):
+    """Replace only previously verified owned bytes; retain local edits on conflict."""
+    from .setup import _atomic_hermes_config_write
+    for path, before, _ in updates:
+        if _read_owned_path(path) != before:
+            raise ValueError('Bundled skill changed during installation; current files were preserved')
+    completed = []
+    try:
+        for path, before, after in updates:
+            if before != after:
+                path.parent.mkdir(parents=True, exist_ok=True, mode=0o700)
+                _atomic_hermes_config_write(path, before, after)
+                completed.append((path, before, after))
+    except Exception:
+        for path, before, after in reversed(completed):
+            if _read_owned_path(path) == after:
+                if before is None:
+                    path.unlink()
+                else:
+                    _atomic_hermes_config_write(path, after, before)
+        # A failed first installation leaves no false ownership claim.
+        for directory in {path.parent for path, _, _ in updates}:
+            if directory.is_dir() and not any(directory.iterdir()):
+                directory.rmdir()
+        raise
+    names = sorted({path.parent.name for path, _, _ in updates})
+    print('Bundled skills available: '+', '.join(names)+'. With this Apsimo adapter version active, ongoing conversations refresh skill discovery on their next request.')

{apsimo-1.4.4 → apsimo-1.4.5}/apsimo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apsimo
-Version: 1.4.4
+Version: 1.4.5
 Summary: Persistent identity, memory and autonomy for AI agents
 License-Expression: MIT
 Requires-Python: >=3.11
@@ -28,7 +28,7 @@ Requires-Dist: pandas>=2.0; extra == "vectors"
 Requires-Dist: pyarrow>=15.0; extra == "vectors"
 Requires-Dist: lancedb>=0.10; extra == "vectors"
 Provides-Extra: hermes
-Requires-Dist: apsimo-hermes<2,>=1.4.4; extra == "hermes"
+Requires-Dist: apsimo-hermes<2,>=1.4.5; extra == "hermes"
 Provides-Extra: mcp
 Requires-Dist: mcp[cli]<2,>=1.0; extra == "mcp"
 Provides-Extra: lancedb

{apsimo-1.4.4 → apsimo-1.4.5}/apsimo.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ apsimo/setup_hermes.py
 apsimo/setup_local_work.py
 apsimo/setup_native_goals.py
 apsimo/setup_native_reviews.py
+apsimo/setup_skills.py
 apsimo/telemetry.py
 apsimo/work_orders.py
 apsimo.egg-info/PKG-INFO
@@ -285,10 +286,8 @@ apsimo/intelligence/graph/consolidator.py
 apsimo/intelligence/graph/distiller.py
 apsimo/intelligence/graph/migrations.py
 apsimo/intelligence/graph/queries.py
-apsimo/intelligence/graph/recall.py
 apsimo/intelligence/graph/reconciler.py
 apsimo/intelligence/graph/schema.py
-apsimo/intelligence/graph/selection.py
 apsimo/intelligence/learning/__init__.py
 apsimo/intelligence/learning/continuous_learner.py
 apsimo/intelligence/learning/feedback_store.py
@@ -313,6 +312,9 @@ apsimo/mcp/__init__.py
 apsimo/mcp/__main__.py
 apsimo/mcp/config.py
 apsimo/mcp/server.py
+apsimo/memory/__init__.py
+apsimo/memory/recall.py
+apsimo/memory/selection.py
 apsimo/mining/__init__.py
 apsimo/mining/corpus.py
 apsimo/mining/escalations.py

{apsimo-1.4.4 → apsimo-1.4.5}/apsimo.egg-info/requires.txt

@@ -35,7 +35,7 @@ beautifulsoup4>=4.12
 neo4j>=5.18
 
 [hermes]
-apsimo-hermes<2,>=1.4.4
+apsimo-hermes<2,>=1.4.5
 
 [lancedb]
 lancedb>=0.6

{apsimo-1.4.4 → apsimo-1.4.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "apsimo"
-version = "1.4.4"
+version = "1.4.5"
 description = "Persistent identity, memory and autonomy for AI agents"
 readme = "README.md"
 license = "MIT"
@@ -29,7 +29,7 @@ dependencies = [
 graph = ["neo4j>=5.18"]
 neo4j = ["neo4j>=5.18"]
 vectors = ["sentence-transformers>=3.0", "pandas>=2.0", "pyarrow>=15.0", "lancedb>=0.10"]
-hermes = ["apsimo-hermes>=1.4.4,<2"]
+hermes = ["apsimo-hermes>=1.4.5,<2"]
 mcp = ["mcp[cli]>=1.0,<2"]
 lancedb = ["lancedb>=0.6", "pyarrow>=14.0", "pandas>=2.0"]
 extraction = ["PyMuPDF>=1.24", "beautifulsoup4>=4.12"]

{apsimo-1.4.4 → apsimo-1.4.5}/tests/test_canonical_source_read.py

@@ -8,7 +8,7 @@ import pytest
 from apsimo.api.middleware import ApiKeyMiddleware
 from apsimo.beliefs.source_projection import SourceClaimProjection
 from apsimo.beliefs.source_time import interpret_time_query
-from apsimo.intelligence.graph.recall import pack_memory_context
+from apsimo.memory.recall import pack_memory_context
 from apsimo.turns import TurnIdempotencyLedger
 from apsimo.turns.source_read import read
 from test_scoped_api_authority import _principal, _write_keyring

{apsimo-1.4.4 → apsimo-1.4.5}/tests/test_current_work_recall_selection.py

@@ -11,7 +11,7 @@ from apsimo.api.authority import RequestAuthority
 from apsimo.api.routers import executions
 from apsimo.beliefs.source_projection import SourceClaimProjection
 from apsimo.beliefs.source_time import MemoryTimeQuery
-from apsimo.intelligence.graph.selection import RecallSelector, current_work_query
+from apsimo.memory.selection import RecallSelector, current_work_query
 from apsimo.turns import TurnIdempotencyLedger
 from apsimo.turns.idempotency import source_message_hash
 from apsimo.turns.source_annotations import expand

{apsimo-1.4.4 → apsimo-1.4.5}/tests/test_media_read_reference_presentation.py

@@ -9,7 +9,7 @@ import httpx
 import pytest
 import pytest_asyncio
 
-from apsimo.intelligence.graph.recall import pack_memory_context, render_memory_context
+from apsimo.memory.recall import pack_memory_context, render_memory_context
 from apsimo.turns import TurnIdempotencyLedger
 from apsimo.turns.media import SourceMedia
 from apsimo.turns.source_annotations import expand, current_candidates

{apsimo-1.4.4 → apsimo-1.4.5}/tests/test_native_setup.py

@@ -139,6 +139,8 @@ def test_new_private_instance_uses_canonical_resources_and_scoped_authority(args
     assert principal['credentials'][0]['secret'] not in (home/'config.yaml').read_text()
     assert (home/'SOUL.md').read_text().startswith('# Orion')
     assert (state/'adapter/apsimo_hermes/evidence.py').is_file()
+    from apsimo.setup_skills import SKILL_NAME, SKILL_RESOURCE
+    assert (home/'skills'/SKILL_NAME/'SKILL.md').read_bytes() == setup_hermes._adapter_resources(args.adapter_wheel)[SKILL_RESOURCE]
     assert (state/'api-keyring.json').stat().st_mode & 0o777 == 0o600
     # Same selected home finds this instance without a separate global pointer.
     monkeypatch.delenv('APSIMO_STATE_DIR', raising=False)
@@ -153,6 +155,102 @@ def test_new_private_instance_uses_canonical_resources_and_scoped_authority(args
     assert before == ((home/'config.yaml').read_bytes(), (state/'api-keyring.json').read_bytes())
 
 
+def test_skills_only_installs_and_refreshes_owned_bytes_without_instance_or_model(args, monkeypatch):
+    from apsimo.setup_skills import SKILL_NAME, SKILL_RESOURCE
+    home = Path(args.hermes_home)
+    home.mkdir()
+    originals = {'config.yaml': b'model: {default: retained}\n', 'SOUL.md': b'Private identity',
+                 'skills/personal/SKILL.md': b'User-authored instructions'}
+    for relative, content in originals.items():
+        path = home/relative; path.parent.mkdir(parents=True, exist_ok=True); path.write_bytes(content)
+    only = SimpleNamespace(skills_only=True, hermes_home=str(home), adapter_wheel=args.adapter_wheel)
+    monkeypatch.setattr(httpx, 'post', lambda *a, **k: pytest.fail('Skills setup called a model'))
+    monkeypatch.setattr(setup_hermes, '_interpreter', lambda *a: pytest.fail('Skills setup changed runtime selection'))
+    assert setup.run_init(None, only) == 0
+    skill = home/'skills'/SKILL_NAME/'SKILL.md'
+    original = skill.read_bytes()
+    current = setup_hermes._adapter_resources(args.adapter_wheel)
+    monkeypatch.setattr(setup_hermes, '_adapter_resources', lambda *a: {**current, SKILL_RESOURCE: original+b'\nA new bundled revision.\n'})
+    assert setup.run_init(None, only) == 0
+    assert skill.read_bytes() == original+b'\nA new bundled revision.\n'
+    before = {path: path.read_bytes() for path in skill.parent.iterdir() if path.is_file()}
+    assert setup.run_init(None, only) == 0
+    assert before == {path: path.read_bytes() for path in skill.parent.iterdir() if path.is_file()}
+    assert all((home/name).read_bytes() == content for name, content in originals.items())
+    assert not (home/'apsimo').exists() and not (home/'.env').exists()
+
+
+def test_skills_only_cli_does_not_continue_into_identity_setup(args, monkeypatch):
+    from apsimo import cli
+    monkeypatch.setattr(cli.sys, 'argv', ['apsimo', 'init', '--skills-only',
+        '--hermes-home', args.hermes_home, '--adapter-wheel', args.adapter_wheel])
+    monkeypatch.setattr(cli, '_load_dotenv', lambda: pytest.fail('Skills-only loaded instance environment'))
+    monkeypatch.setattr(cli, '_cmd_init', lambda *a: pytest.fail('Skills-only initialized identity'))
+    monkeypatch.setattr(httpx, 'post', lambda *a, **k: pytest.fail('Skills-only called a model'))
+    cli.main()
+    assert not (Path(args.hermes_home)/'apsimo').exists()
+
+
+@pytest.mark.parametrize('collision', ['unowned', 'edited', 'symlink'])
+def test_skills_install_preserves_user_owned_or_edited_destinations(args, collision):
+    from apsimo.setup_skills import SKILL_NAME
+    home = Path(args.hermes_home)
+    skill = home/'skills'/SKILL_NAME/'SKILL.md'
+    only = SimpleNamespace(skills_only=True, hermes_home=str(home), adapter_wheel=args.adapter_wheel)
+    if collision == 'edited':
+        assert setup.run_init(None, only) == 0
+    else:
+        skill.parent.mkdir(parents=True)
+    if collision == 'symlink':
+        target = home/'personal.md'; target.write_bytes(b'Keep my research workflow')
+        skill.symlink_to(target)
+    else:
+        skill.write_bytes(b'Keep my research workflow')
+    before = {path: path.read_bytes() for path in home.rglob('*') if path.is_file()}
+    assert setup.run_init(None, only) == 1
+    assert before == {path: path.read_bytes() for path in home.rglob('*') if path.is_file()}
+
+
+def test_new_setup_detects_skill_collision_before_model_or_attachment(args, monkeypatch):
+    from apsimo.setup_skills import SKILL_NAME
+    home = Path(args.hermes_home)
+    skill = home/'skills'/SKILL_NAME/'SKILL.md'
+    skill.parent.mkdir(parents=True); skill.write_text('My own skill')
+    monkeypatch.setattr(httpx, 'post', lambda *a, **k: pytest.fail('Collision must precede inference'))
+    assert setup.run_init(None, args) == 1
+    assert skill.read_text() == 'My own skill'
+    assert not (home/'apsimo').exists() and not (home/'config.yaml').exists()
+
+
+def test_skill_install_rolls_back_a_failed_ownership_write(args, monkeypatch):
+    from apsimo.setup_skills import SKILL_NAME
+    write = setup._atomic_hermes_config_write
+    def fail_marker(path, before, after):
+        if path.name == '.apsimo-owned.json':
+            raise OSError('Fixture ownership write failure')
+        write(path, before, after)
+    monkeypatch.setattr(setup, '_atomic_hermes_config_write', fail_marker)
+    only = SimpleNamespace(skills_only=True, hermes_home=args.hermes_home, adapter_wheel=args.adapter_wheel)
+    assert setup.run_init(None, only) == 1
+    assert not (Path(args.hermes_home)/'skills'/SKILL_NAME).exists()
+
+
+def test_multiple_bundled_skills_validate_all_destinations_before_any_write(tmp_path):
+    from apsimo.setup_skills import BUNDLE_PREFIX, prepare, install
+    home = tmp_path/'profile'
+    resources = {BUNDLE_PREFIX+name+'/SKILL.md': ('Instructions for '+name).encode()
+                 for name in ('apsimo-first', 'apsimo-second')}
+    install(prepare(home, resources))
+    first, second = [home/'skills'/name/'SKILL.md' for name in ('apsimo-first', 'apsimo-second')]
+    second.write_bytes(b'My modified second skill')
+    before = {p: p.read_bytes() for p in home.rglob('*') if p.is_file()}
+    candidate = {path: content+b' updated' for path, content in resources.items()}
+    with pytest.raises(ValueError, match='Locally modified'):
+        prepare(home, candidate, refresh=True)
+    assert before == {p: p.read_bytes() for p in home.rglob('*') if p.is_file()}
+    assert first.read_bytes() == b'Instructions for apsimo-first'
+
+
 def test_enrolled_owner_accounts_resolve_through_the_generated_scoped_api(args, monkeypatch):
     from fastapi import FastAPI
     from apsimo.api.middleware import ApiKeyMiddleware

{apsimo-1.4.4 → apsimo-1.4.5}/tests/test_procedure_source_context.py

@@ -8,7 +8,7 @@ import pytest
 
 from apsimo.beliefs.source_projection import SourceClaimProjection
 from apsimo.beliefs.source_time import interpret_time_query
-from apsimo.intelligence.graph.recall import pack_memory_context
+from apsimo.memory.recall import pack_memory_context
 from apsimo.turns import TurnIdempotencyLedger
 from apsimo.turns.source_read import read
 from test_source_claim_projection import Model, claim

{apsimo-1.4.4 → apsimo-1.4.5}/tests/test_recall_hybrid.py

@@ -3,9 +3,10 @@ from unittest.mock import AsyncMock
 
 import pytest
 
-from apsimo.intelligence.graph.recall import (
-    calibration_fingerprint, lexical_query, render_memory_context,
+from apsimo.memory.recall import (
+    calibration_fingerprint, render_memory_context,
 )
+from apsimo.intelligence.graph.queries import lexical_query
 from test_recall_ranking import RecallFixture, _Hit, _node
 from test_recall_rerank import _RecordingReranker
 

{apsimo-1.4.4 → apsimo-1.4.5}/tests/test_recall_request_repetition.py

@@ -5,8 +5,8 @@ import json
 
 import pytest
 
-from apsimo.intelligence.graph.recall import source_candidates
-from apsimo.intelligence.graph.selection import RecallSelector
+from apsimo.memory.recall import source_candidates
+from apsimo.memory.selection import RecallSelector
 from apsimo.beliefs.source_projection import SourceClaimProjection
 from apsimo.beliefs.source_time import interpret_time_query
 from apsimo.turns.idempotency import TurnIdempotencyLedger, source_message_hash

{apsimo-1.4.4 → apsimo-1.4.5}/tests/test_recall_source_presentation.py

@@ -6,7 +6,7 @@ from httpx import ASGITransport, AsyncClient
 import pytest
 
 from apsimo.beliefs.source_projection import SourceClaimProjection
-from apsimo.intelligence.graph.recall import pack_memory_context, render_memory_context
+from apsimo.memory.recall import pack_memory_context, render_memory_context
 from apsimo.turns import TurnIdempotencyLedger
 from test_procedure_source_context import ProcedureModel, candidates
 from test_source_claim_projection import claim