refactor(tools)!: one tools/skills package; delete skills/skills and tools/tools-skills (CL-8371)

agents/myra/src/tool-packages.ts

@@ -26,7 +26,7 @@ export const ASSISTANT_TOOL_PACKAGE_PINS: readonly ToolPackagePin[] = [
   { name: "@corbits/capability-tools", version: "0.0.7" },
   { name: "@corbits/agent-directory-tools", version: "0.0.7" },
   { name: "@corbits/catalog-tools", version: "0.1.1" },
-  { name: "@corbits/skills-tools", version: "0.0.8" },
+  { name: "@corbits/skills-tools", version: "0.0.9" },
   { name: "@corbits/interaction-tools", version: "0.0.11" },
   { name: "@corbits/manus-tools", version: "0.0.12" },
   { name: "@corbits/workflow-authoring-tools", version: "0.0.8" },

apps/hub/package.json

@@ -23,7 +23,6 @@
     "@corbits/inference-catalog": "workspace:*",
     "@corbits/mailbox": "github:corbitsdev/corbits-mailbox#e85b81e4a2e0cc318dd33a4f0f92337b6fac7f38",
     "@corbits/memory": "github:corbitsdev/corbits-memory#e74da20f148a302dff5400915fe504ee2395e913",
-    "@corbits/skills": "workspace:*",
     "@corbits/tool-registry-publish": "workspace:*",
     "@corbits/url-path": "workspace:*",
     "@corbits/webhook-triggers": "workspace:*",

package.json

@@ -7,17 +7,16 @@
     "agents/*",
     "apps/*",
     "packages/*",
-    "skills/*",
     "tools/*",
     "vendor/intx/*",
     "workflows/*"
   ],
   "scripts": {
     "check": "bun run typecheck && bun run lint && bun run fmt:check && bun run test",
     "typecheck": "bun run scripts/typecheck.ts",
-    "lint": "oxlint apps packages tools agents skills workflows scripts test e2e",
-    "fmt": "oxfmt apps packages tools agents skills workflows scripts test e2e",
-    "fmt:check": "oxfmt --check apps packages tools agents skills workflows scripts test e2e",
+    "lint": "oxlint apps packages tools agents workflows scripts test e2e",
+    "fmt": "oxfmt apps packages tools agents workflows scripts test e2e",
+    "fmt:check": "oxfmt --check apps packages tools agents workflows scripts test e2e",
     "build": "bun run scripts/run-all.ts build",
     "test": "bun run scripts/run-all.ts test",
     "dev": "bun run scripts/dev.ts",

packages/agent-directory/package.json

@@ -16,7 +16,7 @@
   "dependencies": {
     "@corbits/agent-events": "workspace:*",
     "@corbits/error-sink": "workspace:*",
-    "@corbits/skills": "workspace:*",
+    "@corbits/skills-tools": "workspace:*",
     "@corbits/tool-registry-publish": "workspace:*",
     "@corbits/workflows": "workspace:*",
     "@intx/agent": "workspace:*",

packages/agent-directory/src/agent-definition-drafting.ts

@@ -36,7 +36,7 @@ const MAX_DESCRIPTION_LENGTH = 500;
  * `request_capability` bundle every drafted agent gets pinned by
  * default (see `validateAgentDefinitionDraftReplyAgainstInventory`'s
  * default-pin step below), the same way a definition that pins skills
- * always gets `@corbits/tools-skills` alongside them
+ * always gets `@corbits/skills-tools` alongside them
  * (`@corbits/agent-directory`'s `reindexPinnedSkills`) — self-service
  * capability requests are a baseline capability every drafted agent
  * should carry, not something Myra has to remember to choose. Only

packages/agent-directory/src/agent-workflow.test.ts

@@ -1,10 +1,9 @@
 // `SKILLS_TOOL_PACKAGE_PIN` named
-// `@corbits/tools-skills`, but `tool-registry-publish`'s
+// `@corbits/skills-tools`, but `tool-registry-publish`'s
 // `CORBITS_TOOL_PACKAGE_DIRS` never listed that package's directory, so
 // a definition pinning skills carried a pin the corbits-tools registry
 // could never resolve at launch.
 import { describe, expect, test } from "bun:test";
-import path from "node:path";
 import type { DB } from "@intx/db";
 import type { AssetService } from "@intx/hub-sessions";
 import { CORBITS_TOOL_PACKAGE_DIRS, packToolPackageTarball } from "@corbits/tool-registry-publish";
@@ -21,14 +20,14 @@ import {
 describe("SKILLS_TOOL_PACKAGE_PIN", () => {
   test("resolves through the corbits-tools registry", async () => {
     // Assert against what the registry actually carries: the packed
-    // tarball for the pinned package, not a source-tree import.
-    const dir = CORBITS_TOOL_PACKAGE_DIRS.find(
-      (candidate) => path.basename(candidate) === SKILLS_TOOL_PACKAGE_PIN.name.split("/")[1],
-    );
-    expect(dir).toBeDefined();
-    const tarball = await packToolPackageTarball(dir as string);
-    expect(tarball.name).toBe(SKILLS_TOOL_PACKAGE_PIN.name);
-    expect(tarball.version).toBe(SKILLS_TOOL_PACKAGE_PIN.version);
+    // tarball for the pinned package, not a source-tree import. A
+    // package's directory name need not match its `@corbits/*` name
+    // (e.g. `tools/skills` publishes `@corbits/skills-tools`), so this
+    // packs every registered directory rather than guessing one by path.
+    const tarballs = await Promise.all(CORBITS_TOOL_PACKAGE_DIRS.map(packToolPackageTarball));
+    const tarball = tarballs.find((candidate) => candidate.name === SKILLS_TOOL_PACKAGE_PIN.name);
+    expect(tarball).toBeDefined();
+    expect(tarball?.version).toBe(SKILLS_TOOL_PACKAGE_PIN.version);
   });
 });
 

packages/agent-directory/src/agent-workflow.ts

@@ -26,7 +26,7 @@ import {
   AVAILABLE_SKILLS_OPEN_TAG,
   withAvailableSkills,
   type PinnedSkillIndexEntry,
-} from "@corbits/skills";
+} from "@corbits/skills-tools";
 import { type } from "arktype";
 import semver from "semver";
 
@@ -42,8 +42,8 @@ export const AGENT_DEFINITION_STEP_ID = "agent";
  * `skills_load` tool that does not exist.
  */
 export const SKILLS_TOOL_PACKAGE_PIN = {
-  name: "@corbits/tools-skills",
-  version: "0.0.4",
+  name: "@corbits/skills-tools",
+  version: "0.0.9",
 } as const;
 
 /**

packages/agent-directory/src/capability-add.ts

@@ -6,7 +6,7 @@
 // snapshot instead of silently dropping an add. The lock itself lives
 // in `./asset-write.ts` so sibling RMW routes share it.
 
-import type { PinnedSkillIndexEntry } from "@corbits/skills";
+import type { PinnedSkillIndexEntry } from "@corbits/skills-tools";
 import type { DB } from "@intx/db";
 import type { AssetService } from "@intx/hub-sessions";
 

packages/agent-directory/src/inventory.ts

@@ -5,7 +5,7 @@
 // listing logic itself — a tenant's usable agents, tool packages,
 // skills, and models are each already owned by another package
 // (`@corbits/tasks`' definition list, the stock credentials route,
-// `@corbits/skills`' registry, the tenant model catalog route), so
+// `@corbits/skills-tools`' registry, the tenant model catalog route), so
 // task-planner only defines the seam those listers plug into.
 //
 // Memory folds into `listUsableToolPackages` rather than getting its

packages/agent-directory/src/routes.ts

@@ -25,7 +25,7 @@ import { idResource } from "@intx/hub-api";
 import { DEFAULT_ASSET_REF } from "@intx/hub-sessions";
 import type { AssetService } from "@intx/hub-sessions";
 
-import { type PinnedSkillIndexEntry } from "@corbits/skills";
+import { type PinnedSkillIndexEntry } from "@corbits/skills-tools";
 
 import {
   createAgentDefinitionCore,

packages/agent-directory/src/validation.ts

@@ -2,7 +2,7 @@
 // boundary before anything touches the asset service.
 
 import { type } from "arktype";
-import { skillNameSchema } from "@corbits/skills";
+import { skillNameSchema } from "@corbits/skills-tools";
 
 // Mirrors `@intx/hub-sessions`' `ASSET_NAME_PATTERN` exactly (not
 // imported: the constant is internal to that package). A definition's
@@ -25,7 +25,7 @@ function boundedNonBlankString(max: number) {
 }
 
 // A pinned skill names a row in the tenant's skill registry
-// (`@corbits/skills`), so it is bound by exactly the registry's own name
+// (`@corbits/skills-tools`), so it is bound by exactly the registry's own name
 // rule — the same kebab-case, `<=64`-char shape the hub's `skill` kind
 // handler requires of a SKILL.md's frontmatter. A name outside it could
 // never resolve to a real skill, so rejecting it here beats storing a
@@ -102,7 +102,7 @@ export type UpdateDefinitionStatusInput = typeof UpdateDefinitionStatusInput.inf
 
 /** The body of a request that restores a definition to an earlier
  * commit on its own asset history — the same `commitSha` shape
- * `@corbits/skills`' restore route takes, kept plain-text ("history",
+ * `@corbits/skills-tools`' restore route takes, kept plain-text ("history",
  * never "commit SHA") everywhere a person reads it; the sha only
  * appears in a tooltip. */
 export const RestoreDefinitionInput = type({ commitSha: "string > 0" });

packages/agent-directory/src/workflow-capability-routes.ts

@@ -2,7 +2,7 @@
 // capability (`@corbits/capability-tools`'s `request_capability`)
 // — the execution half of `POST /:definitionId/capabilities`
 // / `GET /capabilities/inventory` in `./routes.ts`, mirroring
-// `@corbits/skills`' `createWorkflowSkillRoutes` and
+// `@corbits/skills-tools`' `createWorkflowSkillRoutes` and
 // `@corbits/artifacts-hub`'s workflow-artifacts routes: a workflow child
 // has no browser session, only its sidecar bearer token and its own run
 // address, so it authenticates through a `WorkflowRunAuthenticator`
@@ -65,7 +65,7 @@ import { makeErrorEnvelope } from "@corbits/error-sink";
 /**
  * The tenant + principal + run a presented sidecar token and run
  * address resolve to. Declared structurally (mirroring
- * `@corbits/skills`' `WorkflowRunScope`) rather than importing
+ * `@corbits/skills-tools`' `WorkflowRunScope`) rather than importing
  * `@corbits/artifacts-hub`'s concrete type, so this package carries no
  * dependency on the artifacts plane; `apps/hub` supplies
  * `@corbits/artifacts-hub`'s `createWorkflowRunAuthenticator`, which

packages/agent-directory/src/workflow-create-routes.ts

@@ -39,7 +39,7 @@ import type { DB } from "@intx/db";
 import { tenant, workflowDefinition } from "@intx/db/schema";
 import type { AssetService } from "@intx/hub-sessions";
 
-import { skillNameSchema } from "@corbits/skills";
+import { skillNameSchema } from "@corbits/skills-tools";
 import { isAutomatableWorkflowName } from "@corbits/workflows/catalog";
 
 import {

packages/agent-directory/test/routes.test.ts

@@ -1440,7 +1440,7 @@ test("a create request indexes its pinned skills into the stored system prompt",
   expect(prompt).toContain("skills_load");
   // The prompt tells the model to call `skills_load`, so the bundle that
   // provides it must be pinned on the same push.
-  expect(pinsFrom(workflowJson)).toEqual([{ name: "@corbits/tools-skills", version: "0.0.4" }]);
+  expect(pinsFrom(workflowJson)).toEqual([{ name: "@corbits/skills-tools", version: "0.0.9" }]);
 });
 
 test("pinning a skill the registry cannot resolve is a 400, not a 500", async () => {

packages/tool-registry-publish/src/registry.ts

@@ -61,8 +61,7 @@ export const CORBITS_TOOL_PACKAGE_DIRS: readonly string[] = [
   new URL("../../../tools/agent-directory", import.meta.url).pathname,
   new URL("../../../tools/access", import.meta.url).pathname,
   new URL("../../../tools/interaction", import.meta.url).pathname,
-  new URL("../../../tools/skills-tools", import.meta.url).pathname,
-  new URL("../../../tools/tools-skills", import.meta.url).pathname,
+  new URL("../../../tools/skills", import.meta.url).pathname,
   new URL("../../../tools/github", import.meta.url).pathname,
   new URL("../../../tools/web-search", import.meta.url).pathname,
   new URL("../../../tools/granola", import.meta.url).pathname,