refactor: move memory.ts + ollama.ts to smriti/src, sync upstream v1.1.6#1
Open
refactor: move memory.ts + ollama.ts to smriti/src, sync upstream v1.1.6#1
Conversation
Add memory.ts (conversation storage, search, embedding, recall) and ollama.ts (LLM client for summarization and synthesis) to enable Smriti to import QMD as a proper package dependency. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
These modules are Smriti-specific additions (conversation memory layer and Ollama client) that don't belong in the QMD source tree. Moving them to smriti/src/ means: - qmd/ submodule stays as pure upstream code - Upstream syncs are conflict-free (no smriti code in qmd/src/) - A thin adapter (smriti/src/qmd-internals.ts) is the sole coupling point
ashu17706
force-pushed
the
main
branch
2 times, most recently
from
64991bd to
d58fedf
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
memory.ts,ollama.ts, andmemory.test.tsmoved out of the QMD fork intosmriti/src/. This makesqmd/pure upstream code — no smriti-specific files live here anymore.Why
The previous approach added smriti-specific modules (
memory.ts,ollama.ts) directly into the QMD fork, making upstream syncs painful. Now:qmd/= pure upstream clone, synced withgit merge upstream/mainsmriti/src/qmd-internals.ts= thin adapter (the only file touching../qmd/src/*internals)smriti/src/memory.ts+smriti/src/ollama.ts= smriti-owned implementationsFuture upstream syncs:
cd qmd && git merge upstream/main— no conflicts ever.Changes
qmd/src/memory.ts— deleted (moved tosmriti/src/memory.ts)qmd/src/ollama.ts— deleted (moved tosmriti/src/ollama.ts)qmd/src/memory.test.ts— deleted (tests live insmriti/test/)bun.lock— regenerated after upstream merge (new deps: picomatch, yaml, zod, better-sqlite3, vitest)