@shigureni/minion 0.2.0 → 0.4.0

package/cli/src/index.ts

@@ -20,10 +20,10 @@ Usage:
   minion <command> -h          Show help for a command
 
 Commands:
-  start                     起動する (デフォルト)
+  start                     起動する (すでに起動中なら何もしない)
   dev                       停止してデバッグビルドで起動し直す
   kill                      停止する
-  reboot                    停止してリリースビルドで起動し直す
+  reboot                    停止してリリースビルドで起動し直す (デフォルト)
   status                    起動状況を表示する
   dex                       実績とミニオン図鑑を表示する
   config list               設定値を一覧表示する
@@ -35,7 +35,8 @@ Global flags:
   -v, --version  Show version`
 
 const argv = process.argv.slice(2)
-const args = argv.length === 0 ? ["start"] : argv
+// 引数なしの `minion` は「古いプロセスを止めて起動し直す」= reboot に落とす。
+const args = argv.length === 0 ? ["reboot"] : argv
 
 const request = toRequest(args)
 

package/cli/src/routes/dev/route.ts

@@ -13,10 +13,12 @@ export const help = `Usage: minion dev
 export default factory.createHandlers(helpGuard(help), bodyValidator(schema), async (c) => {
   const killResult = c.env.minion.app.kill()
   if (killResult instanceof Error) return c.text(killResult.message, 500)
+  // 何も止めていないときは kill の行を出さず、起動結果だけを表示する。
+  const killLine = killResult.kind === "killed" ? [formatKillResult(killResult)] : []
   const startResult = await c.env.minion.app.start({ debug: true })
   if (startResult instanceof Error) {
-    return c.text([formatKillResult(killResult), startResult.message].join("\n"), 500)
+    return c.text([...killLine, startResult.message].join("\n"), 500)
   }
-  const text = [formatKillResult(killResult), formatStartResult(startResult)].join("\n")
+  const text = [...killLine, formatStartResult(startResult)].join("\n")
   return c.text(text, isStartError(startResult) ? 500 : 200)
 })

package/cli/src/routes/reboot/route.ts

@@ -13,10 +13,12 @@ export const help = `Usage: minion reboot
 export default factory.createHandlers(helpGuard(help), bodyValidator(schema), async (c) => {
   const killResult = c.env.minion.app.kill()
   if (killResult instanceof Error) return c.text(killResult.message, 500)
+  // 何も止めていないときは kill の行を出さず、起動結果だけを表示する。
+  const killLine = killResult.kind === "killed" ? [formatKillResult(killResult)] : []
   const startResult = await c.env.minion.app.start()
   if (startResult instanceof Error) {
-    return c.text([formatKillResult(killResult), startResult.message].join("\n"), 500)
+    return c.text([...killLine, startResult.message].join("\n"), 500)
   }
-  const text = [formatKillResult(killResult), formatStartResult(startResult)].join("\n")
+  const text = [...killLine, formatStartResult(startResult)].join("\n")
   return c.text(text, isStartError(startResult) ? 500 : 200)
 })

package/lib/engine/gateway/pet-behavior.ts

@@ -21,6 +21,20 @@ export const ACTIONS: { durationMs: [number, number]; weight: number }[] = [
   { weight: 2, durationMs: [2000, 3000] }, // 12 食べる2
 ]
 
+// 稼働していないセッション用の「静かな」行動だけの部分集合(clipIndexはACTIONS/Swiftの
+// 並びを指す)。移動・ジャンプ・食事は含めず、待機と座り姿勢をゆっくり切り替える。
+export const SLEEPING_ACTIONS: {
+  clipIndex: number
+  durationMs: [number, number]
+  weight: number
+}[] = [
+  { clipIndex: 0, weight: 40, durationMs: [6000, 12000] }, // 待機
+  { clipIndex: 7, weight: 15, durationMs: [6000, 12000] }, // 座る1
+  { clipIndex: 8, weight: 15, durationMs: [6000, 12000] }, // 座る2
+  { clipIndex: 9, weight: 15, durationMs: [6000, 12000] }, // 座る3
+  { clipIndex: 10, weight: 15, durationMs: [6000, 12000] }, // 座る4
+]
+
 export type PetAction = { clipIndex: number; durationMs: number }
 
 export function pickAction(random: MinionRandomSource): PetAction {
@@ -43,6 +57,26 @@ export function pickAction(random: MinionRandomSource): PetAction {
   return { clipIndex: chosen, durationMs: min + random.next() * (max - min) }
 }
 
+export function pickSleepingAction(random: MinionRandomSource): PetAction {
+  const roll = random.next() * 100
+  let cumulative = 0
+  let chosen = SLEEPING_ACTIONS[0]
+
+  for (const action of SLEEPING_ACTIONS) {
+    cumulative += action.weight
+    if (roll < cumulative) {
+      chosen = action
+      break
+    }
+  }
+
+  const [min, max] = chosen?.durationMs ?? [0, 0]
+  return {
+    clipIndex: chosen?.clipIndex ?? IDLE_CLIP,
+    durationMs: min + random.next() * (max - min),
+  }
+}
+
 export type PetBehavior = {
   running: boolean
   name: string
@@ -85,9 +119,7 @@ export class PetBehaviorEngine {
       const existing = this.behaviors.get(id)
 
       if (!existing) {
-        const action = info.running
-          ? pickAction(this.random)
-          : { clipIndex: IDLE_CLIP, durationMs: 0 }
+        const action = info.running ? pickAction(this.random) : pickSleepingAction(this.random)
         this.behaviors.set(id, {
           running: info.running,
           name: info.name,
@@ -105,20 +137,16 @@ export class PetBehaviorEngine {
 
       if (existing.running !== info.running) {
         existing.running = info.running
-        if (info.running) {
-          const action = pickAction(this.random)
-          existing.clipIndex = action.clipIndex
-          existing.actionEndsAt = now + action.durationMs
-        } else {
-          // 稼働が止まったら、直前のアクションの途中コマで固まらないよう待機姿勢に戻す。
-          existing.clipIndex = IDLE_CLIP
-        }
-        dirty = true
-      } else if (info.running && now >= existing.actionEndsAt) {
-        const action = pickAction(this.random)
+        // 稼働が止まったときも静かな姿勢を選び直す(走りの途中コマで固まらないように)。
+        const action = info.running ? pickAction(this.random) : pickSleepingAction(this.random)
         existing.clipIndex = action.clipIndex
         existing.actionEndsAt = now + action.durationMs
         dirty = true
+      } else if (now >= existing.actionEndsAt) {
+        const action = info.running ? pickAction(this.random) : pickSleepingAction(this.random)
+        if (action.clipIndex !== existing.clipIndex) dirty = true
+        existing.clipIndex = action.clipIndex
+        existing.actionEndsAt = now + action.durationMs
       }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shigureni/minion",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "Desktop pet that reacts to your Claude Code session activity",
   "keywords": [
     "claude-code",

package/swift/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 6.3
+// swift-tools-version: 5.9
 import PackageDescription
 
 let package = Package(
@@ -14,6 +14,5 @@ let package = Package(
                 .copy("Resources/ChickBlue.png")
             ]
         ),
-    ],
-    swiftLanguageModes: [.v6]
+    ]
 )

package/swift/Sources/open-minion/open_minion.swift

@@ -280,6 +280,9 @@ final class Pet {
             window.setFrameOrigin(NSPoint(x: x, y: y))
         }
 
+        // スポーン時の向きはランダム。移動する行動を取るまでこの向きを保つ。
+        facingLeft = Bool.random()
+
         window.orderFrontRegardless()
     }