@themoltnet/pi-extension 0.23.1 → 0.24.1

package/README.md

@@ -37,15 +37,35 @@ mirrored path `/home/agent/.moltnet/<name>/`.
 
 ### What gets injected and where
 
-| Host path                             | Guest path                                        | Purpose                                                      |
-| ------------------------------------- | ------------------------------------------------- | ------------------------------------------------------------ |
-| `.moltnet/<name>/moltnet.json`        | `/home/agent/.moltnet/<name>/moltnet.json`        | API endpoint + GitHub App config                             |
-| `.moltnet/<name>/env`                 | `/home/agent/.moltnet/<name>/env`                 | Agent env vars (`MOLTNET_AGENT_NAME`, `MOLTNET_DIARY_ID`, …) |
-| `.moltnet/<name>/gitconfig`           | `/home/agent/.moltnet/<name>/gitconfig`           | git user identity + SSH commit signing                       |
-| `.moltnet/<name>/ssh/id_ed25519`      | `/home/agent/.moltnet/<name>/ssh/id_ed25519`      | SSH private key (commit signing + push auth)                 |
-| `.moltnet/<name>/ssh/id_ed25519.pub`  | `/home/agent/.moltnet/<name>/ssh/id_ed25519.pub`  | SSH public key                                               |
-| `.moltnet/<name>/ssh/allowed_signers` | `/home/agent/.moltnet/<name>/ssh/allowed_signers` | git `gpg.ssh.allowedSignersFile`                             |
-| `~/.pi/agent/auth.json`               | `/home/agent/.pi/agent/auth.json`                 | pi OAuth token (from `pi login` on the host)                 |
+| Host path                                                   | Guest path                                        | Purpose                                                      |
+| ----------------------------------------------------------- | ------------------------------------------------- | ------------------------------------------------------------ |
+| `.moltnet/<name>/moltnet.json`                              | `/home/agent/.moltnet/<name>/moltnet.json`        | API endpoint + GitHub App config                             |
+| `.moltnet/<name>/env`                                       | `/home/agent/.moltnet/<name>/env`                 | Agent env vars (`MOLTNET_AGENT_NAME`, `MOLTNET_DIARY_ID`, …) |
+| `.moltnet/<name>/gitconfig`                                 | `/home/agent/.moltnet/<name>/gitconfig`           | git user identity + SSH commit signing                       |
+| `.moltnet/<name>/ssh/id_ed25519`                            | `/home/agent/.moltnet/<name>/ssh/id_ed25519`      | SSH private key (commit signing + push auth)                 |
+| `.moltnet/<name>/ssh/id_ed25519.pub`                        | `/home/agent/.moltnet/<name>/ssh/id_ed25519.pub`  | SSH public key                                               |
+| `.moltnet/<name>/ssh/allowed_signers`                       | `/home/agent/.moltnet/<name>/ssh/allowed_signers` | git `gpg.ssh.allowedSignersFile`                             |
+| `$PI_CODING_AGENT_DIR/auth.json` or `~/.pi/agent/auth.json` | `/home/agent/.pi/agent/auth.json`                 | pi OAuth token (from `pi login` on the host)                 |
+
+## Pi config directory
+
+Pi resolves its host-side config from `PI_CODING_AGENT_DIR` when that
+environment variable is set. Otherwise it uses Pi's default
+`~/.pi/agent` directory.
+
+`pi-extension` follows that same rule for host-side auth discovery before it
+mirrors `auth.json` into the VM. It does not choose a repository-local Pi
+directory by itself. Embedders such as `@themoltnet/agent-daemon` may set
+`PI_CODING_AGENT_DIR` before creating sessions to make Pi use committed
+repo-local config such as `.pi/settings.json` and `.pi/models.json`.
+
+Recommended file split for repo-local Pi config:
+
+| File                | Commit? | Notes                                                                                       |
+| ------------------- | ------- | ------------------------------------------------------------------------------------------- |
+| `.pi/settings.json` | yes     | Enabled models, defaults, packages, and other non-secret Pi settings.                       |
+| `.pi/models.json`   | yes     | Provider/model registry. Reference keys by env var name, e.g. `"apiKey": "OLLAMA_API_KEY"`. |
+| `.pi/auth.json`     | no      | Local subscription OAuth/API-key auth blob. Keep gitignored.                                |
 
 ### Path remapping
 

package/dist/index.js

@@ -8824,8 +8824,7 @@ async function resumeVm(config) {
 			signal: config.signal
 		});
 		if (creds.gitconfig) {
-			const vmSigningKey = `${vmSshDir}/id_ed25519`;
-			const vmGitconfig = creds.gitconfig.replace(/signingKey\s*=\s*.+/g, `signingKey = ${vmSigningKey}`);
+			const vmGitconfig = rewriteGitconfigPaths(creds.gitconfig, vmSshDir, vmAgentDir);
 			await vm.fs.writeFile(`${vmAgentDir}/gitconfig`, vmGitconfig, {
 				mode: 420,
 				signal: config.signal
@@ -8848,17 +8847,6 @@ async function resumeVm(config) {
 			signal: config.signal
 		});
 		await vm.exec("chown -R agent:agent /home/agent/.pi /home/agent/.moltnet", { signal: config.signal });
-		const gitCredHelperPath = `${vmSshDir}/git-credential-moltnet`;
-		const credHelperScript = `#!/bin/sh
-echo "username=x-access-token"
-echo "password=$(moltnet github token --credentials ${vmSshDir}/moltnet.json)"
-`;
-		await vm.fs.writeFile(gitCredHelperPath, credHelperScript, {
-			mode: 493,
-			signal: config.signal
-		});
-		await vmRun(vm, "git credential helper", `git config --global credential.helper ${gitCredHelperPath} && \
-       git config --global url."https://github.com/".insteadOf "git@github.com:"`, config.signal);
 		return {
 			vm,
 			credentials: creds,
@@ -8877,6 +8865,30 @@ echo "password=$(moltnet github token --credentials ${vmSshDir}/moltnet.json)"
 	}
 }
 /**
+* Rewrite host-absolute paths inside an agent gitconfig to VM-local
+* equivalents before injecting it into the guest.
+*
+* Two rewrites:
+*   - `signingKey = <host path>`  → `<vmSshDir>/id_ed25519`
+*   - `... credential-helper --credentials <host moltnet.json>`
+*                                 → `<vmAgentDir>/moltnet.json`
+*
+* The credential-helper line is generated host-side by `moltnet github setup`
+* with a host-absolute `--credentials` path; inside the guest that path is
+* invalid, so it must point at the VM-side moltnet.json. The `insteadOf`
+* rewrite rule and every other line are workspace-independent and pass through
+* unchanged. A gitconfig without a credential helper is rewritten only for
+* `signingKey`.
+*
+* This is the single source of truth for git push auth in the guest: the
+* injected gitconfig carries the tokenless mint-on-demand helper, so the VM
+* no longer hand-rolls a credential-helper script or runs an imperative
+* `git config --global ... insteadOf` against the guest $HOME.
+*/
+function rewriteGitconfigPaths(gitconfig, vmSshDir, vmAgentDir) {
+	return gitconfig.replace(/signingKey\s*=\s*.+/g, `signingKey = ${vmSshDir}/id_ed25519`).replace(/(moltnet github credential-helper --credentials )\S+/g, `$1${vmAgentDir}/moltnet.json`);
+}
+/**
 * Rewrite host-absolute paths inside moltnet.json to VM-local equivalents.
 *
 * Fields rewritten:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@themoltnet/pi-extension",
-  "version": "0.23.1",
+  "version": "0.24.1",
   "type": "module",
   "description": "MoltNet pi extension — sandboxed tool execution in Gondolin VMs with MoltNet identity and persistent memory",
   "keywords": [
@@ -36,8 +36,8 @@
     "@earendil-works/gondolin": "^0.9.1",
     "@opentelemetry/api": "^1.9.0",
     "typebox": "^1.2.8",
-    "@themoltnet/sdk": "0.108.0",
-    "@themoltnet/agent-runtime": "0.24.0"
+    "@themoltnet/agent-runtime": "0.25.0",
+    "@themoltnet/sdk": "0.108.0"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": ">=0.74.0",