Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a65c3b0a73 | ||
|
|
0a90f5781a | ||
|
|
73c0db7750 |
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "oh-my-opencode",
|
||||
"version": "2.4.4",
|
||||
"version": "2.4.5",
|
||||
"description": "OpenCode plugin - custom agents (oracle, librarian) and enhanced features",
|
||||
"main": "dist/index.js",
|
||||
"types": "dist/index.d.ts",
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { existsSync, readdirSync } from "node:fs"
|
||||
import { join } from "node:path"
|
||||
import type { PluginInput } from "@opencode-ai/plugin"
|
||||
import type { ExperimentalConfig } from "../../config"
|
||||
import type { PreemptiveCompactionState, TokenInfo } from "./types"
|
||||
@@ -6,6 +8,10 @@ import {
|
||||
MIN_TOKENS_FOR_COMPACTION,
|
||||
COMPACTION_COOLDOWN_MS,
|
||||
} from "./constants"
|
||||
import {
|
||||
findNearestMessageWithFields,
|
||||
MESSAGE_STORAGE,
|
||||
} from "../../features/hook-message-injector"
|
||||
import { log } from "../../shared/logger"
|
||||
|
||||
export interface SummarizeContext {
|
||||
@@ -48,6 +54,20 @@ function isSupportedModel(modelID: string): boolean {
|
||||
return CLAUDE_MODEL_PATTERN.test(modelID)
|
||||
}
|
||||
|
||||
function getMessageDir(sessionID: string): string | null {
|
||||
if (!existsSync(MESSAGE_STORAGE)) return null
|
||||
|
||||
const directPath = join(MESSAGE_STORAGE, sessionID)
|
||||
if (existsSync(directPath)) return directPath
|
||||
|
||||
for (const dir of readdirSync(MESSAGE_STORAGE)) {
|
||||
const sessionPath = join(MESSAGE_STORAGE, dir, sessionID)
|
||||
if (existsSync(sessionPath)) return sessionPath
|
||||
}
|
||||
|
||||
return null
|
||||
}
|
||||
|
||||
function createState(): PreemptiveCompactionState {
|
||||
return {
|
||||
lastCompactionTime: new Map(),
|
||||
@@ -222,6 +242,21 @@ export function createPreemptiveCompactionHook(
|
||||
if (assistants.length === 0) return
|
||||
|
||||
const lastAssistant = assistants[assistants.length - 1]
|
||||
|
||||
if (!lastAssistant.providerID || !lastAssistant.modelID) {
|
||||
const messageDir = getMessageDir(sessionID)
|
||||
const storedMessage = messageDir ? findNearestMessageWithFields(messageDir) : null
|
||||
if (storedMessage?.model?.providerID && storedMessage?.model?.modelID) {
|
||||
lastAssistant.providerID = storedMessage.model.providerID
|
||||
lastAssistant.modelID = storedMessage.model.modelID
|
||||
log("[preemptive-compaction] using stored message model info", {
|
||||
sessionID,
|
||||
providerID: lastAssistant.providerID,
|
||||
modelID: lastAssistant.modelID,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
await checkAndTriggerCompaction(sessionID, lastAssistant)
|
||||
} catch {}
|
||||
}
|
||||
|
||||
@@ -20,7 +20,6 @@ import {
|
||||
import { grep } from "./grep"
|
||||
import { glob } from "./glob"
|
||||
import { slashcommand } from "./slashcommand"
|
||||
import { skill } from "./skill"
|
||||
|
||||
export { interactive_bash, startBackgroundCheck as startTmuxCheck } from "./interactive-bash"
|
||||
export { getTmuxPath } from "./interactive-bash/utils"
|
||||
@@ -64,5 +63,4 @@ export const builtinTools = {
|
||||
grep,
|
||||
glob,
|
||||
slashcommand,
|
||||
skill,
|
||||
}
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
export * from "./types"
|
||||
export { skill } from "./tools"
|
||||
@@ -1,304 +0,0 @@
|
||||
import { tool } from "@opencode-ai/plugin"
|
||||
import { existsSync, readdirSync, readFileSync } from "fs"
|
||||
import { homedir } from "os"
|
||||
import { join, basename } from "path"
|
||||
import { z } from "zod/v4"
|
||||
import { parseFrontmatter, resolveCommandsInText } from "../../shared"
|
||||
import { resolveSymlink } from "../../shared/file-utils"
|
||||
import { SkillFrontmatterSchema } from "./types"
|
||||
import type { SkillScope, SkillMetadata, SkillInfo, LoadedSkill, SkillFrontmatter } from "./types"
|
||||
|
||||
function parseSkillFrontmatter(data: Record<string, unknown>): SkillFrontmatter {
|
||||
return {
|
||||
name: typeof data.name === "string" ? data.name : "",
|
||||
description: typeof data.description === "string" ? data.description : "",
|
||||
license: typeof data.license === "string" ? data.license : undefined,
|
||||
"allowed-tools": Array.isArray(data["allowed-tools"]) ? data["allowed-tools"] : undefined,
|
||||
metadata:
|
||||
typeof data.metadata === "object" && data.metadata !== null
|
||||
? (data.metadata as Record<string, string>)
|
||||
: undefined,
|
||||
}
|
||||
}
|
||||
|
||||
function discoverSkillsFromDir(
|
||||
skillsDir: string,
|
||||
scope: SkillScope
|
||||
): Array<{ name: string; description: string; scope: SkillScope }> {
|
||||
if (!existsSync(skillsDir)) {
|
||||
return []
|
||||
}
|
||||
|
||||
const entries = readdirSync(skillsDir, { withFileTypes: true })
|
||||
const skills: Array<{ name: string; description: string; scope: SkillScope }> = []
|
||||
|
||||
for (const entry of entries) {
|
||||
if (entry.name.startsWith(".")) continue
|
||||
|
||||
const skillPath = join(skillsDir, entry.name)
|
||||
|
||||
if (entry.isDirectory() || entry.isSymbolicLink()) {
|
||||
const resolvedPath = resolveSymlink(skillPath)
|
||||
|
||||
const skillMdPath = join(resolvedPath, "SKILL.md")
|
||||
if (!existsSync(skillMdPath)) continue
|
||||
|
||||
try {
|
||||
const content = readFileSync(skillMdPath, "utf-8")
|
||||
const { data } = parseFrontmatter(content)
|
||||
|
||||
skills.push({
|
||||
name: data.name || entry.name,
|
||||
description: data.description || "",
|
||||
scope,
|
||||
})
|
||||
} catch {
|
||||
continue
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return skills
|
||||
}
|
||||
|
||||
function discoverSkillsSync(): Array<{ name: string; description: string; scope: SkillScope }> {
|
||||
const userSkillsDir = join(homedir(), ".claude", "skills")
|
||||
const projectSkillsDir = join(process.cwd(), ".claude", "skills")
|
||||
|
||||
const userSkills = discoverSkillsFromDir(userSkillsDir, "user")
|
||||
const projectSkills = discoverSkillsFromDir(projectSkillsDir, "project")
|
||||
|
||||
return [...projectSkills, ...userSkills]
|
||||
}
|
||||
|
||||
const availableSkills = discoverSkillsSync()
|
||||
const skillListForDescription = availableSkills
|
||||
.map((s) => `- ${s.name}: ${s.description} (${s.scope})`)
|
||||
.join("\n")
|
||||
|
||||
async function parseSkillMd(skillPath: string): Promise<SkillInfo | null> {
|
||||
const resolvedPath = resolveSymlink(skillPath)
|
||||
const skillMdPath = join(resolvedPath, "SKILL.md")
|
||||
|
||||
if (!existsSync(skillMdPath)) {
|
||||
return null
|
||||
}
|
||||
|
||||
try {
|
||||
let content = readFileSync(skillMdPath, "utf-8")
|
||||
content = await resolveCommandsInText(content)
|
||||
const { data, body } = parseFrontmatter(content)
|
||||
|
||||
const frontmatter = parseSkillFrontmatter(data)
|
||||
|
||||
const metadata: SkillMetadata = {
|
||||
name: frontmatter.name || basename(skillPath),
|
||||
description: frontmatter.description,
|
||||
license: frontmatter.license,
|
||||
allowedTools: frontmatter["allowed-tools"],
|
||||
metadata: frontmatter.metadata,
|
||||
}
|
||||
|
||||
const referencesDir = join(resolvedPath, "references")
|
||||
const scriptsDir = join(resolvedPath, "scripts")
|
||||
const assetsDir = join(resolvedPath, "assets")
|
||||
|
||||
const references = existsSync(referencesDir)
|
||||
? readdirSync(referencesDir).filter((f) => !f.startsWith("."))
|
||||
: []
|
||||
|
||||
const scripts = existsSync(scriptsDir)
|
||||
? readdirSync(scriptsDir).filter((f) => !f.startsWith(".") && !f.startsWith("__"))
|
||||
: []
|
||||
|
||||
const assets = existsSync(assetsDir)
|
||||
? readdirSync(assetsDir).filter((f) => !f.startsWith("."))
|
||||
: []
|
||||
|
||||
return {
|
||||
name: metadata.name,
|
||||
path: resolvedPath,
|
||||
basePath: resolvedPath,
|
||||
metadata,
|
||||
content: body,
|
||||
references,
|
||||
scripts,
|
||||
assets,
|
||||
}
|
||||
} catch {
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
async function discoverSkillsFromDirAsync(skillsDir: string): Promise<SkillInfo[]> {
|
||||
if (!existsSync(skillsDir)) {
|
||||
return []
|
||||
}
|
||||
|
||||
const entries = readdirSync(skillsDir, { withFileTypes: true })
|
||||
const skills: SkillInfo[] = []
|
||||
|
||||
for (const entry of entries) {
|
||||
if (entry.name.startsWith(".")) continue
|
||||
|
||||
const skillPath = join(skillsDir, entry.name)
|
||||
|
||||
if (entry.isDirectory() || entry.isSymbolicLink()) {
|
||||
const skillInfo = await parseSkillMd(skillPath)
|
||||
if (skillInfo) {
|
||||
skills.push(skillInfo)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return skills
|
||||
}
|
||||
|
||||
async function discoverSkills(): Promise<SkillInfo[]> {
|
||||
const userSkillsDir = join(homedir(), ".claude", "skills")
|
||||
const projectSkillsDir = join(process.cwd(), ".claude", "skills")
|
||||
|
||||
const userSkills = await discoverSkillsFromDirAsync(userSkillsDir)
|
||||
const projectSkills = await discoverSkillsFromDirAsync(projectSkillsDir)
|
||||
|
||||
return [...projectSkills, ...userSkills]
|
||||
}
|
||||
|
||||
function findMatchingSkills(skills: SkillInfo[], query: string): SkillInfo[] {
|
||||
const queryLower = query.toLowerCase()
|
||||
const queryTerms = queryLower.split(/\s+/).filter(Boolean)
|
||||
|
||||
return skills
|
||||
.map((skill) => {
|
||||
let score = 0
|
||||
const nameLower = skill.metadata.name.toLowerCase()
|
||||
const descLower = skill.metadata.description.toLowerCase()
|
||||
|
||||
if (nameLower === queryLower) score += 100
|
||||
if (nameLower.includes(queryLower)) score += 50
|
||||
|
||||
for (const term of queryTerms) {
|
||||
if (nameLower.includes(term)) score += 20
|
||||
if (descLower.includes(term)) score += 10
|
||||
}
|
||||
|
||||
return { skill, score }
|
||||
})
|
||||
.filter(({ score }) => score > 0)
|
||||
.sort((a, b) => b.score - a.score)
|
||||
.map(({ skill }) => skill)
|
||||
}
|
||||
|
||||
async function loadSkillWithReferences(
|
||||
skill: SkillInfo,
|
||||
includeRefs: boolean
|
||||
): Promise<LoadedSkill> {
|
||||
const referencesLoaded: Array<{ path: string; content: string }> = []
|
||||
|
||||
if (includeRefs && skill.references.length > 0) {
|
||||
for (const ref of skill.references) {
|
||||
const refPath = join(skill.path, "references", ref)
|
||||
try {
|
||||
let content = readFileSync(refPath, "utf-8")
|
||||
content = await resolveCommandsInText(content)
|
||||
referencesLoaded.push({ path: ref, content })
|
||||
} catch {
|
||||
// Skip unreadable references
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
name: skill.name,
|
||||
metadata: skill.metadata,
|
||||
basePath: skill.basePath,
|
||||
body: skill.content,
|
||||
referencesLoaded,
|
||||
}
|
||||
}
|
||||
|
||||
function formatSkillList(skills: SkillInfo[]): string {
|
||||
if (skills.length === 0) {
|
||||
return "No skills found in ~/.claude/skills/"
|
||||
}
|
||||
|
||||
const lines = ["# Available Skills\n"]
|
||||
|
||||
for (const skill of skills) {
|
||||
lines.push(`- **${skill.metadata.name}**: ${skill.metadata.description || "(no description)"}`)
|
||||
}
|
||||
|
||||
lines.push(`\n**Total**: ${skills.length} skills`)
|
||||
return lines.join("\n")
|
||||
}
|
||||
|
||||
function formatLoadedSkills(loadedSkills: LoadedSkill[]): string {
|
||||
if (loadedSkills.length === 0) {
|
||||
return "No skills loaded."
|
||||
}
|
||||
|
||||
const skill = loadedSkills[0]
|
||||
const sections: string[] = []
|
||||
|
||||
sections.push(`Base directory for this skill: ${skill.basePath}/`)
|
||||
sections.push("")
|
||||
sections.push(skill.body.trim())
|
||||
|
||||
if (skill.referencesLoaded.length > 0) {
|
||||
sections.push("\n---\n### Loaded References\n")
|
||||
for (const ref of skill.referencesLoaded) {
|
||||
sections.push(`#### ${ref.path}\n`)
|
||||
sections.push("```")
|
||||
sections.push(ref.content.trim())
|
||||
sections.push("```\n")
|
||||
}
|
||||
}
|
||||
|
||||
sections.push(`\n---\n**Launched skill**: ${skill.metadata.name}`)
|
||||
|
||||
return sections.join("\n")
|
||||
}
|
||||
|
||||
export const skill = tool({
|
||||
description: `Execute a skill within the main conversation.
|
||||
|
||||
When you invoke a skill, the skill's prompt will expand and provide detailed instructions on how to complete the task.
|
||||
|
||||
Available Skills:
|
||||
${skillListForDescription}`,
|
||||
|
||||
args: {
|
||||
skill: tool.schema
|
||||
.string()
|
||||
.describe(
|
||||
"The skill name or search query to find and load. Can be exact skill name (e.g., 'python-programmer') or keywords (e.g., 'python', 'plan')."
|
||||
),
|
||||
},
|
||||
|
||||
async execute(args) {
|
||||
const skills = await discoverSkills()
|
||||
|
||||
if (!args.skill) {
|
||||
return formatSkillList(skills) + "\n\nProvide a skill name to load."
|
||||
}
|
||||
|
||||
const matchingSkills = findMatchingSkills(skills, args.skill)
|
||||
|
||||
if (matchingSkills.length === 0) {
|
||||
return (
|
||||
`No skills found matching "${args.skill}".\n\n` +
|
||||
formatSkillList(skills) +
|
||||
"\n\nTry a different skill name."
|
||||
)
|
||||
}
|
||||
|
||||
const loadedSkills: LoadedSkill[] = []
|
||||
|
||||
for (const skillInfo of matchingSkills.slice(0, 3)) {
|
||||
const loaded = await loadSkillWithReferences(skillInfo, true)
|
||||
loadedSkills.push(loaded)
|
||||
}
|
||||
|
||||
return formatLoadedSkills(loadedSkills)
|
||||
},
|
||||
})
|
||||
@@ -1,47 +0,0 @@
|
||||
import { z } from "zod/v4"
|
||||
|
||||
export type SkillScope = "user" | "project"
|
||||
|
||||
/**
|
||||
* Zod schema for skill frontmatter validation
|
||||
* Following Anthropic Agent Skills Specification v1.0
|
||||
*/
|
||||
export const SkillFrontmatterSchema = z.object({
|
||||
name: z
|
||||
.string()
|
||||
.regex(/^[a-z0-9-]+$/, "Name must be lowercase alphanumeric with hyphens only")
|
||||
.min(1, "Name cannot be empty"),
|
||||
description: z.string().min(20, "Description must be at least 20 characters for discoverability"),
|
||||
license: z.string().optional(),
|
||||
"allowed-tools": z.array(z.string()).optional(),
|
||||
metadata: z.record(z.string(), z.string()).optional(),
|
||||
})
|
||||
|
||||
export type SkillFrontmatter = z.infer<typeof SkillFrontmatterSchema>
|
||||
|
||||
export interface SkillMetadata {
|
||||
name: string
|
||||
description: string
|
||||
license?: string
|
||||
allowedTools?: string[]
|
||||
metadata?: Record<string, string>
|
||||
}
|
||||
|
||||
export interface SkillInfo {
|
||||
name: string
|
||||
path: string
|
||||
basePath: string
|
||||
metadata: SkillMetadata
|
||||
content: string
|
||||
references: string[]
|
||||
scripts: string[]
|
||||
assets: string[]
|
||||
}
|
||||
|
||||
export interface LoadedSkill {
|
||||
name: string
|
||||
metadata: SkillMetadata
|
||||
basePath: string
|
||||
body: string
|
||||
referencesLoaded: Array<{ path: string; content: string }>
|
||||
}
|
||||
Reference in New Issue
Block a user