Skip to content

fix(toolchain,ci): pack agent bin at real entry file; fix crates.io base-filesystem path #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NathanFlurry wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −10
Open

fix(toolchain,ci): pack agent bin at real entry file; fix crates.io base-filesystem path #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/publish.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,8 +431,11 @@ jobs:
done
git add -f crates/execution/assets/generated crates/v8-runtime/assets/generated
mkdir -p crates/kernel/assets crates/sidecar/assets
cp packages/core/fixtures/base-filesystem.json crates/kernel/assets/base-filesystem.json
cp packages/core/fixtures/base-filesystem.json crates/sidecar/assets/base-filesystem.json
# The single committed base filesystem lives in the vfs crate (the vfs
# crate embeds it via include_str!); the old packages/core/fixtures/
# path no longer exists, which broke this crates.io publish job.
cp crates/vfs/assets/base-filesystem.json crates/kernel/assets/base-filesystem.json
cp crates/vfs/assets/base-filesystem.json crates/sidecar/assets/base-filesystem.json
- name: Dry-run crate publish
if: ${{ needs.context.outputs.trigger != 'release' }}
run: |
Expand Down
19 changes: 11 additions & 8 deletions packages/agentos-toolchain/src/pack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,11 +284,18 @@ export function pack(options: PackOptions): PackResult {
cpSync(join(tmp, "node_modules"), join(packageDir, "node_modules"), {
recursive: true,
});
// bin/<cmd> → ../node_modules/<name>/<entry> (relative symlink; node resolves
// deps from the realpath's node_modules).
// The sidecar resolves each command from the root package.json "bin" map to
// its REAL entry file in the packed closure (see package_projection
// binEntries) — it must NOT rely on `bin/<cmd>` symlinks: npm/pnpm publish
// DROP symlinks, so a `bin/<cmd>` symlink vanishes from the published tarball
// and the sidecar can't project the entrypoint (the adapter then resolves to
// `/unknown/<cmd>`). So point `bin` at the real relative entry path; also keep
// a `bin/<cmd>` symlink for local `$PATH`/dev use (harmless if published away).
const closureModules = join(packageDir, "node_modules");
const binMap: Record<string, string> = {};
for (const [cmd, entryRel] of Object.entries(bins)) {
const targetAbs = resolveBinTarget(closureModules, name, entryRel);
binMap[cmd] = relative(packageDir, targetAbs).split(/[\\/]/).join("/");
symlinkSync(relative(binDir, targetAbs), join(binDir, cmd));
}
if (pruneNative) {
Expand All @@ -306,12 +313,8 @@ export function pack(options: PackOptions): PackResult {
}

// Write a normal root package.json {name, version, bin}. The sidecar reads
// `version` and commands from here; JSON package metadata lives in
// agentos-package.json next to it.
const binMap: Record<string, string> = {};
for (const cmd of commands) {
binMap[cmd] = `bin/${cmd}`;
}
// `version` and commands from here (bin map → real entry file, built above);
// JSON package metadata lives in agentos-package.json next to it.
writeFileSync(
join(packageDir, "package.json"),
`${JSON.stringify({ name, version, bin: binMap }, null, 2)}\n`,
Expand Down
Loading