From 6fa9f85109923b406f855dd7aceeb2b72ff45295 Mon Sep 17 00:00:00 2001 From: amusingimpala75 <69653100+amusingimpala75@users.noreply.github.com> Date: Mon, 5 Oct 2026 13:31:50 -0400 Subject: [PATCH] pi: replace agent-sandbox with gondolin --- flake.lock | 59 -------- flake.nix | 12 -- modules/pi/default.nix | 128 +----------------- packages/by-name/gondolin/package.nix | 105 ++++++++++++++ .../pi-minimal-footer/fix-agent-dir.patch | 22 +++ .../by-name/pi-minimal-footer/package.nix | 35 +++++ .../by-name/pi-telegram/fix-agent-dir.patch | 36 +++++ packages/by-name/pi-telegram/package.nix | 35 +++++ 8 files changed, 237 insertions(+), 195 deletions(-) create mode 100644 packages/by-name/gondolin/package.nix create mode 100644 packages/by-name/pi-minimal-footer/fix-agent-dir.patch create mode 100644 packages/by-name/pi-minimal-footer/package.nix create mode 100644 packages/by-name/pi-telegram/fix-agent-dir.patch create mode 100644 packages/by-name/pi-telegram/package.nix diff --git a/flake.lock b/flake.lock index cd92d78..697452b 100644 --- a/flake.lock +++ b/flake.lock @@ -1,25 +1,5 @@ { "nodes": { - "agent-sandbox": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1790968430, - "narHash": "sha256-1dWTgGUgEamf9Qq7nU/ObulPbAaPijz4uWhxpPaTrNg=", - "owner": "archie-judd", - "repo": "agent-sandbox.nix", - "rev": "399c186ff1935267222f4c6d1e0592a63e42e3b6", - "type": "github" - }, - "original": { - "owner": "archie-judd", - "repo": "agent-sandbox.nix", - "type": "github" - } - }, "angrr": { "inputs": { "nixpkgs": [ @@ -569,45 +549,8 @@ "type": "github" } }, - "pi-minimal-footer": { - "flake": false, - "locked": { - "dir": "packages/pi-minimal-footer", - "lastModified": 1781698617, - "narHash": "sha256-wAdVfzHddPQqYvRZXzNWY2eYicGa3y2ioUBqIyT9xEE=", - "owner": "ogulcancelik", - "repo": "pi-extensions", - "rev": "1deb3f144d0b64e3e67f61c95922360c4bb25b47", - "type": "github" - }, - "original": { - "dir": "packages/pi-minimal-footer", - "owner": "ogulcancelik", - "repo": "pi-extensions", - "rev": "1deb3f144d0b64e3e67f61c95922360c4bb25b47", - "type": "github" - } - }, - "pi-telegram": { - "flake": false, - "locked": { - "lastModified": 1775268787, - "narHash": "sha256-2Gvr3AogpEHkmGkHetVfaPW9VHyMH9TZaK3swKbvQCw=", - "owner": "badlogic", - "repo": "pi-telegram", - "rev": "cb34008460b6c1ca036d92322f69d87f626be0fc", - "type": "github" - }, - "original": { - "owner": "badlogic", - "repo": "pi-telegram", - "rev": "cb34008460b6c1ca036d92322f69d87f626be0fc", - "type": "github" - } - }, "root": { "inputs": { - "agent-sandbox": "agent-sandbox", "angrr": "angrr", "automader": "automader", "bible": "bible", @@ -628,8 +571,6 @@ "nixpkgs": "nixpkgs", "nixpkgs-bleeding": "nixpkgs-bleeding", "nur": "nur", - "pi-minimal-footer": "pi-minimal-footer", - "pi-telegram": "pi-telegram", "sops-nix": "sops-nix", "wrappers": "wrappers" } diff --git a/flake.nix b/flake.nix index f97f490..8035186 100644 --- a/flake.nix +++ b/flake.nix @@ -19,10 +19,6 @@ ); inputs = { - agent-sandbox = { - url = "github:archie-judd/agent-sandbox.nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; angrr = { url = "github:linyinfeng/angrr"; inputs.nixpkgs.follows = "nixpkgs"; @@ -108,14 +104,6 @@ url = "github:nix-community/NUR"; inputs.nixpkgs.follows = "nixpkgs"; }; - pi-minimal-footer = { - url = "github:ogulcancelik/pi-extensions/1deb3f144d0b64e3e67f61c95922360c4bb25b47?dir=packages/pi-minimal-footer"; - flake = false; - }; - pi-telegram = { - url = "github:badlogic/pi-telegram/cb34008460b6c1ca036d92322f69d87f626be0fc"; - flake = false; - }; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/pi/default.nix b/modules/pi/default.nix index eb9679b..b3d3627 100644 --- a/modules/pi/default.nix +++ b/modules/pi/default.nix @@ -1,7 +1,3 @@ -{ - inputs, - ... -}: { flake.modules.homeManager.pi = { @@ -11,113 +7,12 @@ }: let config-dir = ".config/pi/agent"; - - build = - { - outName ? null, - allowNix ? false, - allowedPackages ? [ ], - rwDirs ? [ ], - rwFiles ? [ ], - roDirs ? [ ], - roFiles ? [ ], - env ? { }, - }: - inputs.agent-sandbox.lib.${pkgs.stdenv.hostPlatform.system}.mkSandbox { - pkg = pkgs.pi-coding-agent; - binName = "pi"; - outName = if outName != null then outName else "pi"; - allowedPackages = - with pkgs; - [ - bash - coreutils - fd - findutils - config.wrappers.custom-git.wrapper - gnugrep - gnused - jq - config.wrappers.jujutsu-weave.wrapper - ripgrep - which - ] - ++ allowedPackages; - rwDirs = [ - "$HOME/${config-dir}" - "$HOME/Library/Application Support/rtk" - ] - ++ rwDirs; - roDirs = [ - pkgs.pi-coding-agent.src - pi-minimal-footer - pi-telegram - pkgs.pi-subagents - ./skills - ] - ++ roDirs; - inherit - rwFiles - roFiles - allowNix - ; - allowUnixSockets = allowNix; - env = { - inherit (config.home.sessionVariables) PI_CODING_AGENT_DIR PI_OFFLINE; - DEEPSEEK_API_KEY = "$(cat ${config.sops.secrets.deepseek_api_key.path})"; - } - // env; - }; - pi-minimal-footer = pkgs.runCommand "pi-minimal-footer" { } '' - mkdir -p $out - substitute ${inputs.pi-minimal-footer + "/index.ts"} $out/pi-minimal-footer.ts \ - --replace-fail '{ buildSessionContext }' '{ buildSessionContext, getAgentDir }' \ - --replace-fail 'homedir(), ".pi", "agent"' 'getAgentDir()' - ''; - pi-telegram = pkgs.runCommand "pi-telegram" { } '' - mkdir -p $out - substitute ${inputs.pi-telegram + "/index.ts"} $out/pi-telegram.ts \ - --replace-fail $'agent";\n' $'agent";\nimport { getAgentDir } from "@mariozechner/pi-coding-agent";\n ' \ - --replace-fail 'homedir(), ".pi", "agent"' 'getAgentDir()' - ''; in { programs.pi-coding-agent = { enable = true; context = ./global-agents.md; configDir = "${config.home.homeDirectory}/${config-dir}"; - package = pkgs.symlinkJoin { - name = "pi-configs"; - paths = [ - (build { }) - (build { - outName = "pi-nix"; - allowNix = true; - allowedPackages = [ - config.wrappers.nix-init.wrapper - config.wrappers.nurl.wrapper - ]; - roFiles = [ - # [TODO] fix: I think its still unautheticated rate-limiting? - "${config.sops.templates."nix-gh-ro-access.conf".path}" - ]; - roDirs = [ - "$HOME/.config/nix" - ]; - rwDirs = [ - "$HOME/.cache/nix" - "$HOME/.local/share/nix" - ]; - }) - (build { - outName = "pi-go"; - allowedPackages = [ pkgs.go ]; - rwDirs = [ - "$HOME/go/pkg" - ]; - }) - ]; - }; settings = { defaultModel = "gpt-5.6-terra"; defaultProvider = "openai-codex"; @@ -155,9 +50,10 @@ "tools" ]) ++ [ - pi-minimal-footer - pi-telegram + "${pkgs.pi-minimal-footer}/extensions/pi-minimal-footer.ts" + "${pkgs.pi-telegram}/extensions/pi-telegram.ts" "${pkgs.pi-subagents}/lib/node_modules/@tintinweb" + "${pkgs.gondolin.pi-extension}/extensions/pi-gondolin.ts" ]; quietStartup = "header"; skills = [ @@ -173,6 +69,7 @@ sessionVariables = { PI_AGENT_DIR = "$HOME/${config-dir}/sessions"; # Stupid ccusage PI_OFFLINE = 1; + DEEPSEEK_API_KEY = "$(cat ${config.sops.secrets.deepseek_api_key.path})"; }; packages = with pkgs; [ @@ -183,21 +80,4 @@ file."${config-dir}/agents".source = config.lib.file.mkOutOfStoreSymlink ./agents; }; }; - - flake-file.inputs = { - agent-sandbox = { - url = "github:archie-judd/agent-sandbox.nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - pi-minimal-footer = { - url = "github:ogulcancelik/pi-extensions/1deb3f144d0b64e3e67f61c95922360c4bb25b47?dir=packages/pi-minimal-footer"; - flake = false; - }; - - pi-telegram = { - url = "github:badlogic/pi-telegram/cb34008460b6c1ca036d92322f69d87f626be0fc"; - flake = false; - }; - }; } diff --git a/packages/by-name/gondolin/package.nix b/packages/by-name/gondolin/package.nix new file mode 100644 index 0000000..ce12a14 --- /dev/null +++ b/packages/by-name/gondolin/package.nix @@ -0,0 +1,105 @@ +{ + lib, + fetchFromGitHub, + fetchPnpmDeps, + makeWrapper, + nodejs_22, + pnpm_12, + pnpmBuildHook, + pnpmConfigHook, + qemu, + stdenvNoCC, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "gondolin"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "earendil-works"; + repo = "gondolin"; + tag = "v${finalAttrs.version}"; + hash = "sha256-zxcP/S9Z4ofke1aligdqEYEEUwyjywyphXgoqyV/Mfs="; + }; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname src; + pnpm = pnpm_12; + hash = "sha256-8zZYuHJ21i7ise6Yb7rFztyFDydnGT1o95jPFxVDcaE="; + fetcherVersion = 4; + }; + + nativeBuildInputs = [ + makeWrapper + nodejs_22 + pnpm_12 + pnpmBuildHook + pnpmConfigHook + ]; + + pnpmWorkspaces = [ "@earendil-works/gondolin" ]; + + __structuredAttrs = true; + strictDeps = true; + + installPhase = '' + runHook preInstall + + install -d $out/bin $out/lib/node_modules + pnpm --filter @earendil-works/gondolin deploy --prod --ignore-scripts $out/lib/node_modules/gondolin + makeWrapper ${nodejs_22}/bin/node $out/bin/gondolin \ + --add-flags "$out/lib/node_modules/gondolin/dist/bin/gondolin.js" \ + --prefix PATH : ${lib.makeBinPath [ qemu ]} + + runHook postInstall + ''; + + passthru.pi-extension = stdenvNoCC.mkDerivation { + pname = "gondolin-pi-extension"; + inherit (finalAttrs) version; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + __structuredAttrs = true; + strictDeps = true; + + installPhase = '' + runHook preInstall + + install -d $out/extensions $out/node_modules/@earendil-works + cat > $out/extensions/pi-gondolin.ts <<'EOF' + process.env.PATH = "${lib.makeBinPath [ qemu ]}:" + (process.env.PATH ?? ""); + EOF + cat ${finalAttrs.src}/host/examples/pi-gondolin.ts >> $out/extensions/pi-gondolin.ts + ln -s ${finalAttrs.finalPackage}/lib/node_modules/gondolin \ + $out/node_modules/@earendil-works/gondolin + cat > $out/package.json <<'EOF' + { + "name": "gondolin-pi-extension", + "private": true, + "pi": { + "extensions": ["./extensions/pi-gondolin.ts"] + } + } + EOF + + runHook postInstall + ''; + + meta = { + description = "Pi extension that runs Pi tools in a Gondolin micro-VM"; + homepage = "https://github.com/earendil-works/gondolin"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; + }; + + meta = { + description = "Local Linux micro-VMs with programmable network and filesystem control"; + homepage = "https://github.com/earendil-works/gondolin"; + license = lib.licenses.asl20; + mainProgram = "gondolin"; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +}) diff --git a/packages/by-name/pi-minimal-footer/fix-agent-dir.patch b/packages/by-name/pi-minimal-footer/fix-agent-dir.patch new file mode 100644 index 0000000..0e7d697 --- /dev/null +++ b/packages/by-name/pi-minimal-footer/fix-agent-dir.patch @@ -0,0 +1,22 @@ +diff --git a/packages/pi-minimal-footer/index.ts b/packages/pi-minimal-footer/index.ts +index 3e4a0122fc..9230117a84 100644 +--- a/packages/pi-minimal-footer/index.ts ++++ b/packages/pi-minimal-footer/index.ts +@@ -8,7 +8,7 @@ + */ + + import type { ExtensionAPI } from "@earendil-works/pi-coding-agent"; +-import { buildSessionContext } from "@earendil-works/pi-coding-agent"; ++import { buildSessionContext, getAgentDir } from "@earendil-works/pi-coding-agent"; + import { visibleWidth, truncateToWidth } from "@earendil-works/pi-tui"; + import { execSync } from "node:child_process"; + import { existsSync, readFileSync } from "node:fs"; +@@ -144,7 +144,7 @@ + // ============ Auth Loading ============ + + function loadAuthJson(): Record { +- const authPath = join(homedir(), ".pi", "agent", "auth.json"); ++ const authPath = join(getAgentDir(), "auth.json"); + try { + if (existsSync(authPath)) { + return JSON.parse(readFileSync(authPath, "utf-8")); diff --git a/packages/by-name/pi-minimal-footer/package.nix b/packages/by-name/pi-minimal-footer/package.nix new file mode 100644 index 0000000..b5d4f06 --- /dev/null +++ b/packages/by-name/pi-minimal-footer/package.nix @@ -0,0 +1,35 @@ +{ + fetchFromGitHub, + stdenvNoCC, +}: +stdenvNoCC.mkDerivation { + name = "pi-minimal-footer"; + version = "0-unstable-2026-09-26"; + + src = fetchFromGitHub { + owner = "ogulcancelik"; + repo = "pi-extensions"; + rev = "373a8cf735e66792dae8b096bc62f8d5cf7693a8"; + hash = "sha256-njwAfX8NW0cXp2c4Rfh0xmrGwd7isHqH5jD2/z8LTqM="; + }; + + patches = [ ./fix-agent-dir.patch ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/extensions + cat packages/pi-minimal-footer/index.ts >> $out/extensions/pi-minimal-footer.ts + cat > $out/package.json <<'EOF' + { + "name": "pi-minimal-footer", + "private": true, + "pi": { + "extensions": ["./extensions/pi-minimal-footer.ts"] + } + } + EOF + + runHook postInstall + ''; +} diff --git a/packages/by-name/pi-telegram/fix-agent-dir.patch b/packages/by-name/pi-telegram/fix-agent-dir.patch new file mode 100644 index 0000000..a42df8f --- /dev/null +++ b/packages/by-name/pi-telegram/fix-agent-dir.patch @@ -0,0 +1,36 @@ +diff --git a/index.ts b/index.ts +index c7bcfa8f87..a843b1a0e5 100644 +--- a/index.ts ++++ b/index.ts +@@ -1,10 +1,9 @@ + import { mkdir, readFile, stat, writeFile } from "node:fs/promises"; + import { basename, extname, join } from "node:path"; +-import { homedir } from "node:os"; + + import type { ImageContent, TextContent } from "@mariozechner/pi-ai"; + import type { AgentMessage } from "@mariozechner/pi-agent-core"; +-import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent"; ++import type { ExtensionAPI, ExtensionContext, getAgentDir } from "@mariozechner/pi-coding-agent"; + import { Type } from "@sinclair/typebox"; + + interface TelegramConfig { +@@ -151,8 +150,8 @@ + flushTimer?: ReturnType; + } + +-const CONFIG_PATH = join(homedir(), ".pi", "agent", "telegram.json"); +-const TEMP_DIR = join(homedir(), ".pi", "agent", "tmp", "telegram"); ++const CONFIG_PATH = join(getAgentDir(), "telegram.json"); ++const TEMP_DIR = join(getAgentDir(), "tmp", "telegram"); + const TELEGRAM_PREFIX = "[telegram]"; + const MAX_MESSAGE_LENGTH = 4096; + const MAX_ATTACHMENTS_PER_TURN = 10; +@@ -280,7 +279,7 @@ + } + + async function writeConfig(config: TelegramConfig): Promise { +- await mkdir(join(homedir(), ".pi", "agent"), { recursive: true }); ++ await mkdir(join(getAgentDir()), { recursive: true }); + await writeFile(CONFIG_PATH, JSON.stringify(config, null, "\t") + "\n", "utf8"); + } + diff --git a/packages/by-name/pi-telegram/package.nix b/packages/by-name/pi-telegram/package.nix new file mode 100644 index 0000000..c912709 --- /dev/null +++ b/packages/by-name/pi-telegram/package.nix @@ -0,0 +1,35 @@ +{ + fetchFromGitHub, + stdenvNoCC, +}: +stdenvNoCC.mkDerivation { + name = "pi-telegram"; + version = "0-unstable-2026-04-03"; + + src = fetchFromGitHub { + owner = "badlogic"; + repo = "pi-telegram"; + rev = "cb34008460b6c1ca036d92322f69d87f626be0fc"; + hash = "sha256-2Gvr3AogpEHkmGkHetVfaPW9VHyMH9TZaK3swKbvQCw="; + }; + + patches = [ ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/extensions + cat index.ts >> $out/extensions/pi-telegram.ts + cat > $out/package.json <<'EOF' + { + "name": "pi-telegram", + "private": true, + "pi": { + "extensions": ["./extensions/pi-telegram.ts"] + } + } + EOF + + runHook postInstall + ''; +} -- knotmirror 0.0.1