apex-code 0.0.1-alpha.4 → 0.0.1-alpha.6

package/dist/core/agent-session.js

@@ -36,10 +36,12 @@ import { evaluateToolCall } from "./permissions/gate.js";
 import { createInteractiveResponder } from "./permissions/responder.js";
 import { expandPromptTemplate } from "./prompt-templates.js";
 import { CURRENT_SESSION_VERSION, getLatestCompactionEntry, TODO_CUSTOM_ENTRY_TYPE, } from "./session-manager.js";
+import { slugifySkillCommandName } from "./skills.js";
 import { createSyntheticSourceInfo } from "./source-info.js";
 import { buildSystemPrompt } from "./system-prompt.js";
 import { createLocalBashOperations } from "./tools/bash.js";
 import { createAllToolDefinitions } from "./tools/index.js";
+import { createSkillSearchToolDefinition } from "./tools/skill-search.js";
 import { createTodoWriteToolDefinition } from "./tools/todo-write.js";
 import { createToolDefinitionFromAgentTool } from "./tools/tool-definition-wrapper.js";
 import { createToolSchemaToolDefinition } from "./tools/tool-schema.js";
@@ -126,6 +128,8 @@ export class AgentSession {
     _sessionStartEvent;
     _permissionGate;
     _evidenceSink;
+    _diagnosticsOperations;
+    _lspOperations;
     _extensionUIContext;
     _extensionMode = "print";
     _extensionCommandContextActions;
@@ -161,6 +165,8 @@ export class AgentSession {
         this._sessionStartEvent = config.sessionStartEvent ?? { type: "session_start", reason: "startup" };
         this._permissionGate = config.permissionGate;
         this._evidenceSink = config.evidenceSink ?? new SessionEvidenceSink(this.sessionManager);
+        this._diagnosticsOperations = config.diagnosticsOperations;
+        this._lspOperations = config.lspOperations;
         // Always subscribe to agent events for internal handling
         // (session persistence, extensions, auto-compaction, retry logic)
         this._unsubscribeAgent = this.agent.subscribe(this._handleAgentEvent);
@@ -1048,9 +1054,16 @@ export class AgentSession {
         if (!text.startsWith("/skill:"))
             return text;
         const spaceIndex = text.indexOf(" ");
-        const skillName = spaceIndex === -1 ? text.slice(7) : text.slice(7, spaceIndex);
+        const commandToken = spaceIndex === -1 ? text.slice(7) : text.slice(7, spaceIndex);
         const args = spaceIndex === -1 ? "" : text.slice(spaceIndex + 1).trim();
-        const skill = this.resourceLoader.getSkills().skills.find((s) => s.name === skillName);
+        // Matched against the slugged command token (SKILL.5), not the raw frontmatter
+        // name -- identity for an already command-safe name, so an exactly-typed raw
+        // name still matches too. A skill whose name contains a space or other
+        // slash-command-breaking character (docs/skills.md's lenient loading allows
+        // this) is only reachable through its slugged token.
+        const skill = this.resourceLoader
+            .getSkills()
+            .skills.find((s) => slugifySkillCommandName(s.name) === commandToken);
         if (!skill)
             return text; // Unknown skill, pass through
         try {
@@ -1929,7 +1942,7 @@ export class AgentSession {
                 sourceInfo: template.sourceInfo,
             }));
             const skills = this._resourceLoader.getSkills().skills.map((skill) => ({
-                name: `skill:${skill.name}`,
+                name: `skill:${slugifySkillCommandName(skill.name)}`,
                 description: skill.description,
                 source: "skill",
                 sourceInfo: skill.sourceInfo,
@@ -2128,6 +2141,9 @@ export class AgentSession {
             : createAllToolDefinitions(this._cwd, {
                 read: { autoResizeImages },
                 bash: { commandPrefix: shellCommandPrefix, shellPath },
+                edit: { diagnosticsOperations: this._diagnosticsOperations },
+                write: { diagnosticsOperations: this._diagnosticsOperations },
+                ...(this._lspOperations ? { lsp: { operations: this._lspOperations } } : {}),
             });
         baseToolDefinitions.tool_schema = createToolSchemaToolDefinition({
             getTool: (name) => {
@@ -2145,6 +2161,12 @@ export class AgentSession {
                 this.sessionManager.appendCustomEntry(TODO_CUSTOM_ENTRY_TYPE, todos);
             },
         });
+        // Reads the resource loader live on every call (not a snapshot taken here), so
+        // a project-trust change or a settings reload that alters the loaded skill set
+        // is reflected on the next search without rebuilding the tool registry.
+        baseToolDefinitions.skill_search = createSkillSearchToolDefinition({
+            getSkills: () => this.resourceLoader.getSkills().skills,
+        });
         this._baseToolDefinitions = new Map(Object.entries(baseToolDefinitions).map(([name, tool]) => [name, tool]));
         const extensionsResult = this._resourceLoader.getExtensions();
         if (options.flagValues) {
@@ -2160,7 +2182,9 @@ export class AgentSession {
         this._applyExtensionBindings(this._extensionRunner);
         const defaultActiveToolNames = this._baseToolsOverride
             ? Object.keys(this._baseToolsOverride)
-            : ["read", "bash", "edit", "write"];
+            : this._lspOperations
+                ? ["read", "bash", "edit", "write", "lsp"]
+                : ["read", "bash", "edit", "write"];
         const baseActiveToolNames = options.activeToolNames ?? defaultActiveToolNames;
         this._refreshToolRegistry({
             activeToolNames: baseActiveToolNames,