new observer

Author: luozhiya

lua/fittencode/fn/buf.lua

@@ -126,20 +126,21 @@ function M.is_valid_buf(buf)
     return true
 end
 
--- 检测一个 buffer 是否是一个文件，并且可读
+-- 检测一个 buffer 是否是一个文件
 -- 并在满足这个条件下返回该文件的路径 (路径是和平台相关的)
 ---@return boolean, string?
 function M.is_filebuf(buf)
     if not M.is_valid_buf(buf) then
         return false
     end
     if vim.api.nvim_buf_is_loaded(buf) and vim.fn.buflisted(buf) == 1 then
-        local path
-        vim.api.nvim_buf_call(buf, function()
-            path = vim.fn.expand('%:p')
-        end)
-        if vim.api.nvim_buf_get_name(buf) ~= '' and path and vim.fn.filereadable(path) == 1 then
-            return true, path
+        local bufname = vim.api.nvim_buf_get_name(buf)
+        if bufname == '' then
+            return false
+        end
+        local stat = vim.uv.fs_stat(bufname)
+        if stat and stat.type == 'file' then
+            return true, bufname
         end
     end
     return false

lua/fittencode/fn/observer.lua

@@ -0,0 +1,67 @@
+local Log = require('fittencode.log')
+
+---@class FittenCode.StateMachine
+---@field private current string
+---@field private transitions table<string, string[]>
+---@field private subscribers function[]
+local StateMachine = {}
+StateMachine.__index = StateMachine
+
+---@class FittenCode.StateMachine.Options
+---@field initial string
+---@field transitions table<string, string[]>
+
+---@param options FittenCode.StateMachine.Options
+---@return FittenCode.StateMachine
+function StateMachine.new(options)
+    local self = setmetatable({}, StateMachine)
+    self.current = options.initial
+    self.transitions = options.transitions
+    self.subscribers = {}
+    return self
+end
+
+---@return string
+function StateMachine:state()
+    return self.current
+end
+
+---@param name string
+---@return boolean
+function StateMachine:is(name)
+    return self.current == name
+end
+
+---@param target string
+---@return boolean
+function StateMachine:transition(target)
+    local from = self.current
+    if self.current ~= target then
+        local valid = self.transitions[self.current]
+        if valid and not vim.tbl_contains(valid, target) then
+            Log.warn('Invalid state transition: {} -> {}', self.current, target)
+            return false
+        end
+        self.current = target
+    end
+    for _, fn in ipairs(self.subscribers) do
+        fn({ from = from, to = target })
+    end
+    return true
+end
+
+---@param fn fun(state: { from: string, to: string })
+function StateMachine:subscribe(fn)
+    self.subscribers[#self.subscribers + 1] = fn
+end
+
+function StateMachine:unsubscribe(fn)
+    for i, cb in ipairs(self.subscribers) do
+        if cb == fn then
+            table.remove(self.subscribers, i)
+            return
+        end
+    end
+end
+
+return StateMachine

lua/fittencode/fn/state_machine.lua

@@ -69,3 +69,20 @@
 ---@field model FittenCode.Inline.Model
 ---@field version number
 ---@field headless boolean
+
+--[[
+    'start',                      -- 创建了 Session，COMPLETION
+    'generating_prompt',          -- 正在构建补全请求的提示词（如代码片段、自然语言问题）。
+    'getting_completion_version', -- 正在获取补全服务版本。
+    'generate_one_stage',         -- 向补全服务发送请求（如 HTTP 请求），等待响应。
+    'suggestions_ready',          -- 成功获取补全建议，可渲染到 UI。
+    'no_more_suggestions',        -- 补全服务返回无结果。
+    'error',                      -- 补全流程失败（如网络错误、参数无效）。
+]]
+---@alias FittenCode.Inline.CompletionEvent.Type 'start' | 'generating_prompt' | 'getting_completion_version' | 'generate_one_stage' |'suggestions_ready' | 'no_more_suggestions' | 'error'
+
+--[[
+    'semantic_segment_pre',  -- 开始语义分割（如中文分词）
+    'semantic_segment_post', -- 完成语义分割
+]]
+---@alias FittenCode.Inline.SessionTaskEvent.Type'semantic_segment_pre' |'semantic_segment_post'

lua/fittencode/inline/_types.lua

@@ -22,14 +22,13 @@ local Promise = require('fittencode.fn.promise')
 local Session = require('fittencode.inline.session')
 local i18n = require('fittencode.i18n')
 local Log = require('fittencode.log')
-local Definitions = require('fittencode.inline.definitions')
 local CtrlObserver = require('fittencode.inline.ctrl_observer')
 local ProgressIndicator = require('fittencode.fn.progress_indicator')
-local Observer = require('fittencode.fn.observer')
 local Color = require('fittencode.color')
 local LspServer = require('fittencode.integrations.completion.lsp_server')
+local StateMachine = require('fittencode.fn.state_machine')
 
--- local Status = CtrlObserver.Status
+local Status = CtrlObserver.Status
 -- local ProgressIndicatorObserver = CtrlObserver.ProgressIndicatorObserver
 -- local TimingObserver = CtrlObserver.TimingObserver
 
@@ -38,11 +37,13 @@ local LspServer = require('fittencode.integrations.completion.lsp_server')
 ---@field rhs function
 ---@field options? table<string, any>
 
+---@class FittenCode.Observer
+---@field update function
+
 ---@class FittenCode.Inline.Controller
 ---@field observers FittenCode.Observer[]
 ---@field sessions FittenCode.Inline.Session[]
 ---@field filter_events table<string, boolean>
----@field status_observer FittenCode.Inline.Status
 ---@field keymaps FittenCode.Keymap[]
 local Controller = {}
 Controller.__index = Controller
@@ -63,8 +64,8 @@ function Controller:_initialize(options)
     self.current_session = nil
     self.filter_events = {}
     self.keymaps = {}
-    -- self.status_observer = Status.new()
-    -- self:add_observer(self.status_observer)
+    self.status_observer = Status.new()
+    self:on(self.status_observer)
     -- self.pi = ProgressIndicator.new()
     -- self.progress_observer = ProgressIndicatorObserver.new({ pi = self.pi })
     -- self:add_observer(self.progress_observer)
@@ -116,6 +117,13 @@ function Controller:_initialize(options)
             self:edit_completion_cancel({ vimev = args })
         end,
     })
+    vim.api.nvim_create_autocmd({ 'BufEnter', 'BufFilePost', 'FileType' }, {
+        group = vim.api.nvim_create_augroup('FittenCode.Inline.ServiceUpdate', { clear = true }),
+        pattern = '*',
+        callback = function(args)
+            self:sync_state()
+        end,
+    })
     if Config.integrations.completion.lsp_server then
         Log.debug('Completion integration: LSP server enabled')
         -- vim.lsp.enable('FittenCode')
@@ -139,53 +147,53 @@ function Controller:_initialize(options)
     })
     -- If {fn} returns an empty string, {key} is discarded/ignored.
     vim.on_key(function(key)
-        local buf = vim.api.nvim_get_current_buf()
         self.filter_events = {}
-        if vim.api.nvim_get_mode().mode:sub(1, 1) == 'i' and self:is_enabled(buf) then
+        if vim.api.nvim_get_mode().mode:sub(1, 1) == 'i' and not self.state:is('disabled') then
             if vim.tbl_contains(filtered, key) and Config.inline_completion.disable_completion_when_delete then
                 self.filter_events = { 'CursorMovedI', 'TextChangedI', }
                 return
             end
         end
     end)
-end
 
----@param observer FittenCode.Observer | function
-function Controller:add_observer(observer)
-    if type(observer) == 'function' then
-        local id = 'callback_observer' .. Fn.generate_short_id_as_string()
-        observer = setmetatable({
-            id = id,
-            update = function(_, ctrl, event)
-                observer(ctrl, event)
-            end
-        }, { __index = Observer })
-    end
-    self.observers[observer.id] = observer
-    return observer
-end
-
----@param identifier string | FittenCode.Observer
-function Controller:remove_observer(identifier)
-    local id = type(identifier) == 'string' and identifier or identifier.id
-    self.observers[id] = nil
+    -- 进入buffer检测类型或手动更改类型，决定 disabled/enabled
+    -- current_session.id == source.id { != terminated } running/idle
+    self.state = StateMachine.new({
+        initial = 'idle',
+        transitions = {
+            idle     = { 'running', 'disabled' },
+            running  = { 'idle', 'disabled' },
+            disabled = { 'idle', 'running' },
+        },
+    })
+    self.state:subscribe(function(value)
+        self:emit({
+            ctrl = value.to,
+        })
+    end)
 end
 
----@param id string
-function Controller:get_observer(id)
-    return self.observers[id]
+function Controller:on(observer)
+    table.insert(self.observers, observer)
 end
 
----@param event FittenCode.Inline.Event
-function Controller:notify_observers(event)
-    vim.tbl_map(function(observer)
-        observer:update(self, event)
-    end, self.observers)
+function Controller:off(observer)
+    for i, obs in ipairs(self.observers) do
+        if obs == observer then
+            table.remove(self.observers, i)
+            break
+        end
+    end
 end
 
----@param event FittenCode.Inline.Event
-function Controller:_emit(event)
-    self:notify_observers(event)
+function Controller:emit(...)
+    for _, observer in ipairs(self.observers) do
+        if type(observer) == 'function' then
+            observer(...)
+        elseif observer.update then
+            observer:update(...)
+        end
+    end
 end
 
 function Controller:has_completions()
@@ -264,7 +272,7 @@ function Controller:trigger_inline_suggestion(options)
     local force = (options.force == nil) and false or options.force
 
     local is_insert_mode = vim.api.nvim_get_mode().mode:sub(1, 1) == 'i'
-    local is_enabled = self:is_enabled(buf)
+    local is_enabled = not self.state:is('disabled')
     local has_access_token = api_key_manager:has_fitten_access_token()
     local is_filtered_event = options.vimev and vim.tbl_contains(self.filter_events, options.vimev.event)
     local is_within_the_line = Config.inline_completion.disable_completion_within_the_line and check_is_within_the_line(position)
@@ -287,33 +295,32 @@ function Controller:trigger_inline_suggestion(options)
         id = assert(Fn.generate_short_id(13)),
         trigger_inline_suggestion = function(...) self:trigger_inline_suggestion_auto(...) end,
         is_outdated = function(s)
-            if s.id ~= self.current_session.id then
+            if not self.current_session or s.id ~= self.current_session.id then
                 Log.debug('latest_session id = {}, other id = {}', self.current_session.id, s.id)
                 return true
             end
             return false
         end
     })
+    self.current_session:on(function(value)
+        local id = (self.current_session and not self.current_session:is_terminated()) and self.current_session.id
+        if not self.state:is('disabled') then
+            if not id then
+                self.state:transition('idle')
+            elseif id == value.id then
+                self.state:transition('running')
+            end
+        end
+        self:emit({
+            ctrl = self.state:state(),
+            current_session_id = id,
+            session = value
+        })
+    end)
 
     return self.current_session:send_completions()
 end
 
--- ---@param data FittenCode.Inline.Event.Data
--- function Controller:on_session_event(data)
---     if data.session_event == SESSION_EVENT.CREATED then
---         self:_emit({ event = CONTROLLER_EVENT.INLINE_RUNNING, data = { id = data.id } })
---         self:_emit({ event = CONTROLLER_EVENT.SESSION_ADDED, data = { id = data.id } })
---     elseif data.session_event == SESSION_EVENT.TERMINATED then
---         Log.debug('Controller received session terminated event, event session id = {}, selected_session_id = {}', data.id, self.selected_session_id)
---         self:_emit({ event = CONTROLLER_EVENT.SESSION_DELETED, data = { id = data.id } })
---         self.sessions[data.id] = nil
---         if not self.selected_session_id or self.selected_session_id == data.id then
---             self.selected_session_id = nil
---             self:_emit({ event = CONTROLLER_EVENT.INLINE_IDLE, data = { id = data.id } })
---         end
---     end
--- end
-
 ---@return FittenCode.Inline.Session?
 function Controller:get_active_session()
     local session = self:get_current_session()
@@ -327,15 +334,30 @@ function Controller:get_current_session()
     return self.current_session
 end
 
----@param buf integer
-function Controller:is_enabled(buf)
+---@param buf integer?
+function Controller:should_enable(buf)
+    if buf == nil then
+        buf = vim.api.nvim_get_current_buf()
+    end
     local filebuf = true
     if Config.inline_completion.disable_completion_when_nofile_buffer then
         filebuf = F.is_filebuf(buf)
     end
     return Config.inline_completion.enable and filebuf and not self:is_ft_disabled(buf)
 end
 
+function Controller:sync_state()
+    if self:should_enable() then
+        if self.current_session and not self.current_session:is_terminated() then
+            self.state:transition('running')
+        else
+            self.state:transition('idle')
+        end
+    else
+        self.state:transition('disabled')
+    end
+end
+
 ---@param msg string
 ---@param timeout number
 ---@param timestamp number
@@ -459,11 +481,19 @@ function Controller:set_suffix_permissions(enable, suffixes)
         end
     end
     Config.disable_specific_inline_completion.suffixes = vim.tbl_keys(suffix_map)
+    self:sync_state()
 end
 
----@return FittenCode.Inline.Status
 function Controller:get_status()
-    return self.status_observer
+    return self.status_observer:get_snapshot()
+    -- if self:is_enabled() then
+    --     if self.current_session and not self.current_session:is_terminated() then
+    --         return 'running'
+    --     end
+    --     return 'idle'
+    -- else
+    --     return 'disabled'
+    -- end
 end
 
 return Controller