@hienlh/ppm 0.17.47 → 0.17.48

package/src/services/slash-discovery/skill-loader.ts

@@ -53,6 +53,34 @@ function walkDir(dir: string, visitor: (filePath: string) => void, visited = new
   }
 }
 
+/**
+ * Resolve the invocable name for an item found under `root`.
+ *
+ * Plugin items are namespaced by their owning plugin, but the two kinds differ
+ * in what follows the prefix. A skill or command is named after where its file
+ * lives, so a kit that self-namespaces instead (AgentKit ships `name: ak:debug`)
+ * is not invocable under that declared name — it is kept as an alias so typed
+ * input can be rewritten to the canonical one. An agent is named after its
+ * frontmatter `name`, which is also how the runtime addresses it for delegation.
+ */
+function qualify(
+  root: SkillRoot,
+  pathName: string,
+  declared: string | undefined,
+  nameSource: "path" | "declared" = "path",
+): { name: string; aliases?: string[] } {
+  if (!root.pluginName) return { name: declared ?? pathName };
+  if (nameSource === "declared") {
+    const suffix = declared || pathName;
+    return { name: suffix ? `${root.pluginName}:${suffix}` : "" };
+  }
+  // A SKILL.md sitting at the plugin root has no directory to take a name from
+  const suffix = pathName || declared;
+  if (!suffix) return { name: "" };
+  const name = `${root.pluginName}:${suffix}`;
+  return { name, ...(declared && declared !== name && { aliases: [declared] }) };
+}
+
 /** Collect commands from a root with origin "commands" */
 function loadCommands(root: SkillRoot): SlashItemWithSource[] {
   const items: SlashItemWithSource[] = [];
@@ -66,10 +94,13 @@ function loadCommands(root: SkillRoot): SlashItemWithSource[] {
       const content = readFileSync(filePath, "utf-8");
       const { meta } = parseFrontmatter(content);
       const rel = relative(root.path, filePath);
-      const name = rel.replace(/\.md$/, "").split(sep).join("/");
+      const pathName = rel.replace(/\.md$/, "").split(sep).join("/");
+      const { name, aliases } = qualify(root, pathName, str(meta.name));
+      if (!name) return;
       items.push({
         type: "command",
-        name: str(meta.name) ?? name,
+        name,
+        ...(aliases && { aliases }),
         description: str(meta.description) ?? "",
         argumentHint: str(meta["argument-hint"]),
         scope,
@@ -106,11 +137,12 @@ function loadSkills(root: SkillRoot): SlashItemWithSource[] {
       dirsWithSkillMd.add(skillDir);
       const rel = relative(root.path, skillDir);
       const pathName = rel.split(sep).join("/");
-      const name = str(meta.name) ?? pathName;
+      const { name, aliases } = qualify(root, pathName, str(meta.name));
       if (!name) return;
       items.push({
         type: "skill",
         name,
+        ...(aliases && { aliases }),
         description: str(meta.description) ?? "",
         argumentHint: str(meta["argument-hint"]),
         scope,
@@ -136,11 +168,12 @@ function loadSkills(root: SkillRoot): SlashItemWithSource[] {
         const { meta } = parseFrontmatter(content);
         const rel = relative(root.path, filePath);
         const pathName = rel.replace(/\.md$/, "").split(sep).join("/");
-        const name = str(meta.name) ?? pathName;
+        const { name, aliases } = qualify(root, pathName, str(meta.name));
         if (!name) return;
         items.push({
           type: "skill",
           name,
+          ...(aliases && { aliases }),
           description: str(meta.description) ?? "",
           argumentHint: str(meta["argument-hint"]),
           scope,
@@ -168,7 +201,9 @@ function loadAgents(root: SkillRoot): SlashItemWithSource[] {
       const content = readFileSync(filePath, "utf-8");
       const { meta } = parseFrontmatter(content);
       const rel = relative(root.path, filePath);
-      const name = str(meta.name) ?? rel.replace(/\.md$/, "").split(sep).join("/");
+      const pathName = rel.replace(/\.md$/, "").split(sep).join("/");
+      const { name } = qualify(root, pathName, str(meta.name), "declared");
+      if (!name) return;
       items.push({
         type: "agent",
         name,

package/src/services/slash-discovery/types.ts

@@ -41,6 +41,12 @@ export interface SkillRoot {
   path: string;              // Resolved absolute path
   source: DefinitionSource;
   origin: ItemOrigin;
+  /**
+   * Owning Claude Code plugin, set only for roots under ~/.claude/plugins/.
+   * Items below such a root are namespaced `<pluginName>:<path>`, matching how
+   * Claude Code itself registers them.
+   */
+  pluginName?: string;
 }
 
 /** Extends SlashItem with source metadata */

package/src/types/api.ts

@@ -70,6 +70,7 @@ export type ChatWsServerMessage =
   | { type: "phase_changed"; phase: SessionPhase; elapsed?: number }
   | { type: "session_state"; sessionId: string; phase: SessionPhase; pendingApproval: { requestId: string; tool: string; input: unknown } | null; sessionTitle: string | null; model?: string; effort?: string; thinking?: boolean }
   | { type: "turn_events"; events: unknown[] }
+  | { type: "user_message"; content: string; imageCount?: number; timestamp?: string }
   | { type: "title_updated"; title: string }
   | { type: "compact_status"; status: "compacting" | "done" }
   | { type: "ping" };

package/src/web/hooks/use-chat.ts

@@ -610,6 +610,26 @@ export function useChat(sessionId: string | null, providerId = "claude", project
     // on the global bus (`use-global-events.ts`) instead of here — a chat socket is
     // not guaranteed to exist since chat tabs mount lazily.
 
+    // A user message sent from another device/tab of this session — render its
+    // bubble. The sender never receives this echo (server excludes the sender),
+    // so no dedupe against the optimistic append is needed.
+    if ((data as any).type === "user_message") {
+      const content = (data as any).content as string;
+      setMessages((prev) => {
+        const last = prev[prev.length - 1];
+        // Dedupe: a concurrent turn_events replay or REST refetch may already
+        // have appended this same turn's user message.
+        if (last?.role === "user" && last.content === content) return prev;
+        return [...prev, {
+          id: `user-remote-${Date.now()}`,
+          role: "user" as const,
+          content,
+          timestamp: (data as any).timestamp ?? new Date().toISOString(),
+        }];
+      });
+      return;
+    }
+
     // Handle title updates from SDK summary
     if ((data as any).type === "title_updated") {
       setSessionTitle((data as any).title ?? null);